Skip to content

gh-108303: Fix and move badsyntax_pep3120.py - #109513

Merged
AlexWaygood merged 4 commits into
python:mainfrom
sobolevn:issue-108303-badsyntax
Sep 18, 2023
Merged

gh-108303: Fix and move badsyntax_pep3120.py#109513
AlexWaygood merged 4 commits into
python:mainfrom
sobolevn:issue-108303-badsyntax

Conversation

@sobolevn

@sobolevnsobolevn commented Sep 17, 2023•
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

When creating tokenizedata/ I've missed this file. Fixing this now.

Also:

  • Fixed paths in .ruff.toml, because I moved some files
  • Remove misleading comment about VCS, because it is not marked as binary in .gitattributes

@bedevere-appbedevere-appBot mentioned this pull request Sep 17, 2023
Closed
AlexWaygood
AlexWaygood reviewed Sep 17, 2023
View reviewed changes
Comment threadLib/test/.ruff.toml Outdated
Comment threadLib/test/.ruff.toml Outdated
hugovk
hugovk reviewed Sep 17, 2023
View reviewed changes
Comment threadLib/test/.ruff.toml
AlexWaygood
AlexWaygood previously approved these changes Sep 17, 2023
View reviewed changes
@AlexWaygood
AlexWaygood dismissed their stale reviewSeptember 17, 2023 10:50

Reviewed too soon, let's find consensus on the ruff config

AlexWaygood
AlexWaygood reviewed Sep 17, 2023
View reviewed changes
Comment threadLib/test/.ruff.toml Outdated
@sobolevn@AlexWaygood
Update Lib/test/.ruff.toml
3986284
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
AlexWaygood
AlexWaygood approved these changes Sep 17, 2023
View reviewed changes

@AlexWaygoodAlexWaygood 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.

Thanks!

hugovk
hugovk approved these changes Sep 17, 2023
View reviewed changes

@hugovkhugovk 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.

Thank you!

@hugovkhugovk mentioned this pull request Sep 17, 2023
Closed
vstinner
vstinner approved these changes Sep 18, 2023
View reviewed changes

@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

@AlexWaygood
AlexWaygood merged commit 4dd47c6 into python:mainSep 18, 2023
@vstinner

vstinner commented Sep 18, 2023

Copy link
Copy Markdown
Member

@AlexWaygood AlexWaygood merged commit 4dd47c6

Oh! I was merged this PR while you merged it :-)

@AlexWaygood

AlexWaygood commented Sep 18, 2023

Copy link
Copy Markdown
Member

@AlexWaygood AlexWaygood merged commit 4dd47c6

Oh! I was merged this PR while you merged it :-)

Too slow ;-)

@vstinner

vstinner commented Sep 18, 2023

Copy link
Copy Markdown
Member

Too slow ;-)

Working in the train today, Internet is not great :-(

@vstinnervstinner added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Sep 21, 2023
@miss-islington

miss-islington commented Sep 21, 2023

Copy link
Copy Markdown
Contributor

Thanks @sobolevn for the PR, and @AlexWaygood for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington

miss-islington commented Sep 21, 2023

Copy link
Copy Markdown
Contributor

Thanks @sobolevn for the PR, and @AlexWaygood for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington

miss-islington commented Sep 21, 2023

Copy link
Copy Markdown
Contributor

Sorry, @sobolevn and @AlexWaygood, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 4dd47c63a97b3c39cd964ad12431fcdaf76dc823 3.12

@miss-islington

miss-islington commented Sep 21, 2023

Copy link
Copy Markdown
Contributor

Sorry, @sobolevn and @AlexWaygood, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 4dd47c63a97b3c39cd964ad12431fcdaf76dc823 3.11

@vstinner

vstinner commented Sep 21, 2023

Copy link
Copy Markdown
Member

Oh, backport this change needs to wait until PR #109314 is backported to 3.11 and 3.12.

sobolevn added a commit to sobolevn/cpython that referenced this pull request Sep 22, 2023
@sobolevn
[3.11]pythongh-108303: Fix and movebadsyntax_pep3120.py(pythonGH…
b248118
…-109513)
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>.
(cherry picked from commit 4dd47c6)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
@bedevere-app

bedevere-appBot commented Sep 22, 2023

Copy link
Copy Markdown

GH-109724 is a backport of this pull request to the 3.11 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.11 only security fixes label Sep 22, 2023
@AlexWaygoodAlexWaygood removed their assignment Sep 22, 2023
vstinner pushed a commit that referenced this pull request Sep 22, 2023
@sobolevn
[3.11]gh-108303: Fix and movebadsyntax_pep3120.py(GH-109513) (#1…
6bb18bb
…09724)
* [3.11] gh-108303: Fix and move `badsyntax_pep3120.py` (GH-109513)
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>.
(cherry picked from commit 4dd47c6)
Backport to 3.11: update also test_imp.
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
csm10495 pushed a commit to csm10495/cpython that referenced this pull request Sep 28, 2023
@sobolevn@AlexWaygood@csm10495
pythongh-108303: Fix and movebadsyntax_pep3120.py(python#109513)
3394750
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
hugovk pushed a commit to hugovk/cpython that referenced this pull request Feb 25, 2025
@sobolevn@AlexWaygood@hugovk
[3.12]pythongh-108303: Fix and movebadsyntax_pep3120.py(pythonGH…
dad2fb7
…-109513)
(cherry picked from commit 4dd47c6)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
@bedevere-app

bedevere-appBot commented Feb 25, 2025

Copy link
Copy Markdown

GH-130540 is a backport of this pull request to the 3.12 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.12 only security fixes label Feb 25, 2025
hugovk added a commit that referenced this pull request Feb 26, 2025
@hugovk@sobolevn@AlexWaygood
[3.12]gh-108303: Fix and movebadsyntax_pep3120.py(GH-109513) (#1…
e280976
…30540)
(cherry picked from commit 4dd47c6)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vstinnervstinnervstinner approved these changes
@hugovkhugovkhugovk approved these changes
@AlexWaygoodAlexWaygoodAlexWaygood approved these changes

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@sobolevn@vstinner@AlexWaygood@miss-islington@hugovk