Skip to content

[3.13] gh-136759: rename lock.h to pylock.h (GH-137041) #137075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2025

Conversation

aisk
Copy link
Member

@aisk aisk commented Jul 24, 2025

Rename lock.h to pylock.h to avoid conflicts with headers of other projects. (cherry picked from commit ec02db5)

Rename `lock.h` to `pylock.h` to avoid conflicts with headers of other projects.
(cherry picked from commit ec02db5)

Co-authored-by: AN Long <aisk@users.noreply.github.com>
@kumaraditya303 kumaraditya303 added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Jul 24, 2025
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @kumaraditya303 for commit 14bf176 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F137075%2Fmerge

If you want to schedule another build, you need to add the 🔨 test-with-buildbots label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Jul 24, 2025
@kumaraditya303 kumaraditya303 merged commit 74503ac into python:3.13 Jul 24, 2025
134 of 145 checks passed
@aisk aisk deleted the backport-ec02db5-3.13 branch July 24, 2025 23:51
@zooba
Copy link
Member

zooba commented Jul 28, 2025

Oh no no no, this is way too big a change for 3.13. The file system layout is fixed from beta 1 - changing in 3.14rc2 is a big enough breach of our compatibility policy, but this one should definitely be reverted (as annoying as that is for people with other projects that provide this file).

Our own references to the header should be relative (i.e. #include "lock.h" rather than <lock.h>), and so putting the Python headers below the other headers should work fine.

@bedevere-app
Copy link

bedevere-app bot commented Jul 28, 2025

GH-137166 is a backport of this pull request to the 3.13 branch.

kumaraditya303 added a commit to kumaraditya303/cpython that referenced this pull request Jul 28, 2025
@kumaraditya303
Copy link
Contributor

Oh no no no, this is way too big a change for 3.13. The file system layout is fixed from beta 1 - changing in 3.14rc2 is a big enough breach of our compatibility policy, but this one should definitely be reverted (as annoying as that is for people with other projects that provide this file).

Sorry, I created the revert PR here #137166 but it does mean that this issue will be forever in 3.13.

@zooba
Copy link
Member

zooba commented Jul 28, 2025

it does mean that this issue will be forever in 3.13.

Yeah, that's the nature of compatibility! It also means that anyone whose #include <lock.h> currently works will continue working, which is the more important side of things.

kumaraditya303 added a commit that referenced this pull request Jul 28, 2025
…137075) (#137166)

Revert "[3.13] gh-136759: rename `lock.h` to `pylock.h` (GH-137041) (#137075)"

This reverts commit 74503ac.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants