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-119698: symtable: Fix merge race by JelleZijlstra · Pull Request #120779 · python/cpython

Conversation

@JelleZijlstra

@JelleZijlstra JelleZijlstra commented Jun 20, 2024 •
edited by bedevere-app Bot
Loading

Uh oh!

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

Copy link
Copy Markdown
Member

Fixes buildbot failures from #120151.

  • Issue: symtable.Class.get_methods() returns non-methods #119698

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@JelleZijlstra
pythongh-119698: symtable: Fix merge race
d4ca048
@bedevere-app bedevere-app Bot mentioned this pull request Jun 20, 2024
symtable.Class.get_methods() returns non-methods #119698
Closed
@JelleZijlstra
JelleZijlstra enabled auto-merge (squash) June 20, 2024 04:46
@bedevere-app bedevere-app Bot added the awaiting core review label Jun 20, 2024
@JelleZijlstra JelleZijlstra self-assigned this Jun 20, 2024
@JelleZijlstra JelleZijlstra added the skip news label Jun 20, 2024
@JelleZijlstra
JelleZijlstra disabled auto-merge June 20, 2024 04:53
@JelleZijlstra
fix doctest
35f8855
@JelleZijlstra
JelleZijlstra enabled auto-merge (squash) June 20, 2024 05:05
@JelleZijlstra
not in 3.14
0511bd1
@JelleZijlstra
JelleZijlstra merged commit 3846fcf into python:main Jun 20, 2024
@bedevere-app bedevere-app Bot removed the awaiting core review label Jun 20, 2024
@JelleZijlstra
JelleZijlstra deleted the fixsymtable branch June 20, 2024 05:49
@picnixz

picnixz commented Jun 20, 2024 •
edited
Loading

Uh oh!

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

Copy link
Copy Markdown
Member

Oh yes, I forgot to update the branch (I try to avoid merging main into my branches if there is no conflict to solve in order to avoid notifications).

Thank you Jelle for the other PR by the way!
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
mrahtz pushed a commit to mrahtz/cpython that referenced this pull request Jun 30, 2024
@JelleZijlstra @mrahtz
pythongh-119698: symtable: Fix merge race (python#120779)
59896c4
estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024
@JelleZijlstra @estyxx
pythongh-119698: symtable: Fix merge race (python#120779)
db9fb59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Uh oh!

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

Assignees

@JelleZijlstra JelleZijlstra

Labels

skip news

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.

2 participants

@JelleZijlstra @picnixz
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 01402503 — 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.