Skip to content

gh-138944: Fix SyntaxError message for invalid syntax following valid import-as statement#138945

Merged
pablogsal merged 4 commits intopython:mainfrom
brianschubert:gh-138944-import-as-err
Oct 26, 2025
Merged

gh-138944: Fix SyntaxError message for invalid syntax following valid import-as statement#138945
pablogsal merged 4 commits intopython:mainfrom
brianschubert:gh-138944-import-as-err

Conversation

@brianschubert
Copy link
Contributor

@brianschubert brianschubert commented Sep 15, 2025 •
edited by bedevere-app bot
Loading

@bedevere-app bedevere-app bot mentioned this pull request Sep 15, 2025
Closed
@brianschubert brianschubert added the needs backport to 3.14 bugs and security fixes label Sep 15, 2025
efimov-mikhail
efimov-mikhail approved these changes Oct 21, 2025
View reviewed changes
Copy link
Member

@efimov-mikhail efimov-mikhail left a comment

Choose a reason for hiding this comment

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

LGTM

@pablogsal pablogsal merged commit 3dab11f into python:main Oct 26, 2025
45 checks passed
@miss-islington-app
Copy link

miss-islington-app bot commented Oct 26, 2025

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

@miss-islington-app
Copy link

miss-islington-app bot commented Oct 26, 2025

Sorry, @brianschubert and @pablogsal, I could not cleanly backport this to 3.14 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 3dab11f888fda34c02734e4468d1acd4c36927fe 3.14

@pablogsal
Copy link
Member

pablogsal commented Oct 26, 2025

Thanks for the fix @brianschubert ❤️

@pablogsal
Copy link
Member

pablogsal commented Oct 26, 2025

Can you do the backport as per #138945 (comment) ?

brianschubert added a commit to brianschubert/cpython that referenced this pull request Oct 27, 2025
@brianschubert
[3.14] pythongh-138944: Fix SyntaxError message for invalid syntax …
14f1c55 
…following valid import-as statement (pythonGH-138945)

(cherry picked from commit 3dab11f)

Co-authored-by: Brian Schubert <brianm.schubert@gmail.com>
@bedevere-app
Copy link

bedevere-app bot commented Oct 27, 2025

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

@bedevere-app bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Oct 27, 2025
@bedevere-bot
Copy link

bedevere-bot commented Oct 27, 2025

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot AMD64 CentOS9 NoGIL Refleaks 3.x (tier-1) has failed when building commit 3dab11f.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/#/builders/1610/builds/2313) and take a look at the build logs.
  4. Check if the failure is related to this commit (3dab11f) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/#/builders/1610/builds/2313

Failed tests:

  • test_free_threading

Test leaking resources:

  • test_free_threading: file descriptors

Summary of the results of the build (if available):

==

Click to see traceback logs 
remote: Enumerating objects: 14, done.        
remote: Counting objects:   7% (1/13)        
remote: Counting objects:  15% (2/13)        
remote: Counting objects:  23% (3/13)        
remote: Counting objects:  30% (4/13)        
remote: Counting objects:  38% (5/13)        
remote: Counting objects:  46% (6/13)        
remote: Counting objects:  53% (7/13)        
remote: Counting objects:  61% (8/13)        
remote: Counting objects:  69% (9/13)        
remote: Counting objects:  76% (10/13)        
remote: Counting objects:  84% (11/13)        
remote: Counting objects:  92% (12/13)        
remote: Counting objects: 100% (13/13)        
remote: Counting objects: 100% (13/13), done.        
remote: Compressing objects:  33% (1/3)        
remote: Compressing objects:  66% (2/3)        
remote: Compressing objects: 100% (3/3)        
remote: Compressing objects: 100% (3/3), done.        
remote: Total 14 (delta 10), reused 11 (delta 10), pack-reused 1 (from 1)        
From https://github.com/python/cpython
 * branch                    main       -> FETCH_HEAD
Note: switching to '3dab11f888fda34c02734e4468d1acd4c36927fe'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 3dab11f888f gh-138944: Fix `SyntaxError` message for invalid syntax following valid import-as statement (#138945)
Switched to and reset branch 'main'

configure: WARNING: no system libmpdec found; falling back to pure-Python version for the decimal module

make: *** [Makefile:2489: buildbottest] Error 2

@lysnikolaou
Copy link
Member

lysnikolaou commented Oct 31, 2025

I think we can backport this to 3.13 as well.

lysnikolaou pushed a commit that referenced this pull request Oct 31, 2025
@brianschubert
[3.14] gh-138944: Fix SyntaxError message for invalid syntax follow…
d0c78a4 
…ing valid import-as statement (GH-138945) (#140646)

(cherry picked from commit 3dab11f)
@efimov-mikhail
Copy link
Member

efimov-mikhail commented Oct 31, 2025

I think we can backport this to 3.13 as well.

There's no need to backport for 3.13, it has no such flaw.
I propose to close the issue.

@lysnikolaou
Copy link
Member

lysnikolaou commented Oct 31, 2025

Oh right, ok, closing the issue.

StanFromIreland pushed a commit to StanFromIreland/cpython that referenced this pull request Dec 6, 2025
@brianschubert @StanFromIreland
pythongh-138944: Fix SyntaxError message for invalid syntax followi…
0fde45f 
…ng valid import-as statement (python#138945)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@efimov-mikhail efimov-mikhail efimov-mikhail approved these changes

@pablogsal pablogsal Awaiting requested review from pablogsal pablogsal is a code owner

@lysnikolaou lysnikolaou Awaiting requested review from lysnikolaou lysnikolaou is a code owner

Assignees

@pablogsal pablogsal

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@brianschubert @pablogsal @bedevere-bot @lysnikolaou @efimov-mikhail