GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — gh-136759: Rename lock.h to pylock.h by aisk · Pull Request #137041 · python/cpython

Conversation

@aisk

@aisk aisk commented Jul 23, 2025 •
edited by bedevere-app Bot
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Member
  • Issue: <lock.h> filename is too generic #136759

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
aisk and others added 2 commits July 23, 2025 22:19
@aisk
Rename lock.h to pylock.h
648a733
@aisk
Add news entry
f265080
@aisk
aisk requested review from a team and erlend-aasland as code owners July 23, 2025 13:32
@bedevere-app bedevere-app Bot added the awaiting review label Jul 23, 2025
@bedevere-app bedevere-app Bot mentioned this pull request Jul 23, 2025
<lock.h> filename is too generic #136759
Closed
@ZeroIntensity
ZeroIntensity requested a review from colesbury July 23, 2025 14:36
colesbury
colesbury approved these changes Jul 23, 2025
View reviewed changes

@colesbury colesbury left a comment

Copy link
Copy Markdown
Contributor

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

Thanks!

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@bedevere-app bedevere-app Bot added awaiting merge and removed awaiting review labels Jul 23, 2025
@colesbury colesbury added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Jul 23, 2025
@bedevere-bot

bedevere-bot commented Jul 23, 2025

Copy link
Copy Markdown

🤖 New build scheduled with the buildbot fleet by @colesbury for commit f265080 🤖

Results will be shown at:

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

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

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Jul 23, 2025
@emmatyping

emmatyping commented Jul 23, 2025

Copy link
Copy Markdown
Member

I thought it would be good to review OSS code to see if there are any third-party projects that have a file "pylock.h", as we probably don't want to break those projects either. Fortunately I was not able to find anything that obviously conflicts.

Pixar's OpenUSD repository does have a file that is name-equivalent on case-insensitive filesystems like NTFS on Windows: https://github.com/PixarAnimationStudios/OpenUSD/blob/d0d5c33d5655f206a02b58311efa841890fb3894/pxr/base/tf/pyLock.h. However, this file is only included as #include <pxr/base/tf/pyLock.h>, so it shouldn't conflict.

There were no matches on pypi.org data either. I ran the following ClickHouse query against the https://py-code.org data to verify that:

SELECT    
 project_name,
 countIf(distinct project_name, notEquals(extractAll(path, 'pylock\.(h|hh|hpp|c|cc|cpp)'), [])) AS has_pylock
from      pypi
where     skip_reason = ''
group by project_name
order by has_pylock desc;

This came back with every row having 0 count.

colesbury, aisk, and dehnert reacted with thumbs up emoji
All reactions
  • 👍 3 reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

emmatyping
emmatyping approved these changes Jul 23, 2025
View reviewed changes
kumaraditya303
kumaraditya303 approved these changes Jul 24, 2025
View reviewed changes
@kumaraditya303
kumaraditya303 merged commit ec02db5 into python:main Jul 24, 2025
@bedevere-app bedevere-app Bot removed the awaiting merge label Jul 24, 2025
@kumaraditya303 kumaraditya303 added needs backport to 3.13 only security fixes needs backport to 3.14 bugs and security fixes labels Jul 24, 2025
@miss-islington-app

miss-islington-app Bot commented Jul 24, 2025

Copy link
Copy Markdown

Thanks @aisk for the PR, and @kumaraditya303 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@miss-islington-app

miss-islington-app Bot commented Jul 24, 2025

Copy link
Copy Markdown

Thanks @aisk for the PR, and @kumaraditya303 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@miss-islington-app

miss-islington-app Bot commented Jul 24, 2025

Copy link
Copy Markdown

Sorry, @aisk and @kumaraditya303, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker ec02db5caa546cb4759999453bd6efc1d517b95c 3.13
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@miss-islington-app miss-islington-app Bot assigned kumaraditya303 Jul 24, 2025
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 24, 2025
@aisk @miss-islington
pythongh-136759: rename lock.h to pylock.h (pythonGH-137041)
4183f54
Rename `lock.h` to `pylock.h` to avoid conflicts with headers of other projects.
(cherry picked from commit ec02db5)

Co-authored-by: AN Long <[email protected]>
@bedevere-app

bedevere-app Bot commented Jul 24, 2025

Copy link
Copy Markdown

GH-137072 is a backport of this pull request to the 3.14 branch.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-app bedevere-app Bot removed the needs backport to 3.14 bugs and security fixes label Jul 24, 2025
@aisk
aisk deleted the lock-header-rename branch July 24, 2025 11:32
@aisk

aisk commented Jul 24, 2025

Copy link
Copy Markdown
Member Author

I'll try to resolve the backport conflict for 3.13.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-app

bedevere-app Bot commented Jul 24, 2025

Copy link
Copy Markdown

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

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-app bedevere-app Bot removed the needs backport to 3.13 only security fixes label Jul 24, 2025
kumaraditya303 pushed a commit that referenced this pull request Jul 24, 2025
@aisk
[3.13] gh-136759: rename lock.h to pylock.h (GH-137041) (#137075)
74503ac
Rename `lock.h` to `pylock.h` to avoid conflicts with headers of other projects.
(cherry picked from commit ec02db5)
kumaraditya303 added a commit to kumaraditya303/cpython that referenced this pull request Jul 28, 2025
@kumaraditya303
Revert "[3.13] pythongh-136759: rename lock.h to pylock.h (python…
b3f790f
…GH-137041) (python#137075)"

This reverts commit 74503ac.
kumaraditya303 added a commit that referenced this pull request Jul 28, 2025
@kumaraditya303
[3.13] gh-136759: revert rename lock.h to pylock.h (GH-137041) (#…
3f57d9b
…137075) (#137166)

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

This reverts commit 74503ac.
taegyunkim pushed a commit to taegyunkim/cpython that referenced this pull request Aug 4, 2025
@aisk @taegyunkim
pythongh-136759: rename lock.h to pylock.h (python#137041)
b88f3d9
Rename `lock.h` to `pylock.h` to avoid conflicts with headers of other projects.
Agent-Hellboy pushed a commit to Agent-Hellboy/cpython that referenced this pull request Aug 19, 2025
@aisk @Agent-Hellboy
pythongh-136759: rename lock.h to pylock.h (python#137041)
f9b4e6b
Rename `lock.h` to `pylock.h` to avoid conflicts with headers of other projects.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@colesbury colesbury colesbury approved these changes
@emmatyping emmatyping emmatyping approved these changes
@kumaraditya303 kumaraditya303 kumaraditya303 approved these changes
@erlend-aasland erlend-aasland Awaiting requested review from erlend-aasland erlend-aasland is a code owner

Uh oh!

There was an error while loading. Please reload this page.

Assignees

@kumaraditya303 kumaraditya303

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

5 participants

@aisk @bedevere-bot @emmatyping @colesbury @kumaraditya303
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.