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 — [3.14] gh-136759: rename `lock.h` to `pylock.h` (GH-137041) by miss-islington · Pull Request #137072 · python/cpython

Conversation

@miss-islington

@miss-islington miss-islington commented Jul 24, 2025 •
edited by bedevere-app Bot
Loading

Uh oh!

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

Copy link
Copy Markdown
Contributor

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]

  • 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 @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]>
@miss-islington
miss-islington requested review from a team and erlend-aasland as code owners July 24, 2025 10:46
@bedevere-app bedevere-app Bot added the awaiting review label Jul 24, 2025
This was referenced Jul 24, 2025
<lock.h> filename is too generic #136759
Closed
gh-136759: Rename lock.h to pylock.h #137041
Merged
@aisk

aisk commented Jul 24, 2025

Copy link
Copy Markdown
Member

All PRs on 3.14 branch are failing, so I don't think this is related and we can wait for the fix.

All reactions

Sorry, something went wrong.

Uh oh!

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

@zware
Merge branch '3.14' into backport-ec02db5-3.14
254bcd8
ZeroIntensity
ZeroIntensity approved these changes Jul 24, 2025
View reviewed changes

@ZeroIntensity ZeroIntensity left a comment

Copy link
Copy Markdown
Member

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.

CI seems to be all good.

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 24, 2025
@ZeroIntensity
ZeroIntensity requested a review from kumaraditya303 July 24, 2025 23:21
kumaraditya303
kumaraditya303 approved these changes Jul 25, 2025
View reviewed changes
@kumaraditya303 kumaraditya303 added the DO-NOT-MERGE label Jul 28, 2025
@dehnert dehnert mentioned this pull request Aug 2, 2025
Python 3.13 compatibility mit-athena/python-afs#6
Open
@aisk

aisk commented Aug 12, 2025

Copy link
Copy Markdown
Member

According to #137075, I think we should close this.

All reactions

Sorry, something went wrong.

Uh oh!

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

@aisk aisk closed this Aug 12, 2025
@miss-islington
miss-islington deleted the backport-ec02db5-3.14 branch January 2, 2026 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ZeroIntensity ZeroIntensity ZeroIntensity 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

No one assigned

Labels

awaiting merge DO-NOT-MERGE

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

@miss-islington @aisk @ZeroIntensity @kumaraditya303 @zware
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.