Skip to content

gh-150452: use PyMutex in socket module - #150453

Merged
kumaraditya303 merged 4 commits into
python:mainfrom
KowalskiThomas:kowalski/refactor-use-pymutex-in-socket-module
Jul 15, 2026
Merged

gh-150452: use PyMutex in socket module#150453
kumaraditya303 merged 4 commits into
python:mainfrom
KowalskiThomas:kowalski/refactor-use-pymutex-in-socket-module

Conversation

@KowalskiThomas

@KowalskiThomasKowalskiThomas commented May 26, 2026

Copy link
Copy Markdown
Contributor

@kumaraditya303

Copy link
Copy Markdown
Contributor

The change is not user-facing, news isn't needed. This PR alone is sufficient, you can close the other one and I'll backport this.

Comment threadModules/socketmodule.c Outdated
Comment threadMisc/NEWS.d/next/Library/2026-05-26-08-57-31.gh-issue-150406.jF3g63.rst Outdated
Comment threadModules/socketmodule.c
@KowalskiThomas
KowalskiThomas marked this pull request as ready for review May 29, 2026 15:53

@vstinnervstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please fix the merge conflict?

Comment threadMisc/NEWS.d/next/Library/2026-05-26-08-57-31.gh-issue-150406.jF3g63.rst Outdated
@KowalskiThomas
KowalskiThomasforce-pushed the kowalski/refactor-use-pymutex-in-socket-module branch from 15788c0 to 98b12b7CompareJune 1, 2026 13:41
@KowalskiThomas

Copy link
Copy Markdown
ContributorAuthor

@vstinner rebased and fixed the merge conflict from my other PR

@vstinnervstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kumaraditya303

Copy link
Copy Markdown
Contributor

There are merge conflicts.

@KowalskiThomas
KowalskiThomasforce-pushed the kowalski/refactor-use-pymutex-in-socket-module branch from 98b12b7 to 83dd464CompareJuly 15, 2026 10:08
@KowalskiThomas

Copy link
Copy Markdown
ContributorAuthor

@kumaraditya303 just had a look, error handling for Initialize gethostbyname lock had been changed in the meantime.

I had to rebase (instead of merge main into my branch) because Git would complain about merging "unrelated histories" -- I've never seen that before so I'm not sure what happened there.

Anyway, should be good now.

@kumaraditya303
kumaraditya303 enabled auto-merge (squash) July 15, 2026 10:28
@kumaraditya303
kumaraditya303 merged commit 4f3be1b into python:mainJul 15, 2026
51 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

socket module should use PyMutex instead of Lock

3 participants

@KowalskiThomas@kumaraditya303@vstinner