Skip to content

gh-138151: Fix annotationlib handling of multiple nonlocals #138164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
JelleZijlstra merged 2 commits into from
Nov 3, 2025
Merged

gh-138151: Fix annotationlib handling of multiple nonlocals #138164

JelleZijlstra merged 2 commits into from
Nov 3, 2025

Conversation

@JelleZijlstra
Copy link
Member

@JelleZijlstra JelleZijlstra commented Aug 26, 2025 •
edited by bedevere-app bot
Loading

@JelleZijlstra JelleZijlstra added needs backport to 3.14 bugs and security fixes and removed awaiting core review labels Aug 26, 2025
@bedevere-app bedevere-app bot mentioned this pull request Aug 26, 2025
Closed
@JelleZijlstra JelleZijlstra mentioned this pull request Sep 6, 2025
Closed
@JelleZijlstra JelleZijlstra merged commit b1027d4 into python:main Nov 3, 2025
46 checks passed
@miss-islington-app
Copy link

miss-islington-app bot commented Nov 3, 2025

Thanks @JelleZijlstra for the PR 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 3, 2025
@JelleZijlstra @miss-islington
pythongh-138151: Fix annotationlib handling of multiple nonlocals (py…
321c693 
…thonGH-138164)

(cherry picked from commit b1027d4)

Co-authored-by: Jelle Zijlstra <[email protected]>
@bedevere-app
Copy link

bedevere-app bot commented Nov 3, 2025

GH-140949 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 Nov 3, 2025
JelleZijlstra added a commit that referenced this pull request Nov 3, 2025
@miss-islington @JelleZijlstra
[3.14] gh-138151: Fix annotationlib handling of multiple nonlocals (G…
08012a9 
…H-138164) (#140949)

gh-138151: Fix annotationlib handling of multiple nonlocals (GH-138164)
(cherry picked from commit b1027d4)

Co-authored-by: Jelle Zijlstra <[email protected]>
@bedevere-bot
Copy link

bedevere-bot commented Nov 3, 2025

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

Hi! The buildbot ARM64 macOS 3.14 (tier-2) has failed when building commit 08012a9.

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/1772/builds/668) and take a look at the build logs.
  4. Check if the failure is related to this commit (08012a9) 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/1772/builds/668

Failed tests:

  • test_urllib2net

Failed subtests:

  • test_ftp - test.test_urllib2net.OtherNetworkTests.test_ftp

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

==

Click to see traceback logs 
Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.14.pablogsal-macos-m1.macos-with-brew/build/Lib/urllib/request.py", line 1546, in ftp_open
    fp, retrlen = fw.retrfile(file, type)
                  ~~~~~~~~~~~^^^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.14.pablogsal-macos-m1.macos-with-brew/build/Lib/urllib/request.py", line 1806, in retrfile
    conn, retrlen = self.ftp.ntransfercmd(cmd)
                    ~~~~~~~~~~~~~~~~~~~~~^^^^^
  File "/Users/buildbot/buildarea/3.14.pablogsal-macos-m1.macos-with-brew/build/Lib/ftplib.py", line 354, in ntransfercmd
    conn = socket.create_connection((host, port), self.timeout,
                                    source_address=self.source_address)
  File "/Users/buildbot/buildarea/3.14.pablogsal-macos-m1.macos-with-brew/build/Lib/socket.py", line 870, in create_connection
    raise exceptions[0]
  File "/Users/buildbot/buildarea/3.14.pablogsal-macos-m1.macos-with-brew/build/Lib/socket.py", line 855, in create_connection
    sock.connect(sa)
    ~~~~~~~~~~~~^^^^
TimeoutError: timed out


Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.14.pablogsal-macos-m1.macos-with-brew/build/Lib/test/test_urllib2net.py", line 260, in _test_urls
    f = urlopen(url, req, support.INTERNET_TIMEOUT)
  File "/Users/buildbot/buildarea/3.14.pablogsal-macos-m1.macos-with-brew/build/Lib/test/test_urllib2net.py", line 28, in wrapped
    return _retry_thrice(func, exc, *args, **kwargs)
  File "/Users/buildbot/buildarea/3.14.pablogsal-macos-m1.macos-with-brew/build/Lib/test/test_urllib2net.py", line 24, in _retry_thrice
    raise last_exc
  File "/Users/buildbot/buildarea/3.14.pablogsal-macos-m1.macos-with-brew/build/Lib/test/test_urllib2net.py", line 20, in _retry_thrice
    return func(*args, **kwargs)
  File "/Users/buildbot/buildarea/3.14.pablogsal-macos-m1.macos-with-brew/build/Lib/urllib/request.py", line 487, in open
    response = self._open(req, data)
  File "/Users/buildbot/buildarea/3.14.pablogsal-macos-m1.macos-with-brew/build/Lib/urllib/request.py", line 504, in _open
    result = self._call_chain(self.handle_open, protocol, protocol +
                              '_open', req)
  File "/Users/buildbot/buildarea/3.14.pablogsal-macos-m1.macos-with-brew/build/Lib/urllib/request.py", line 464, in _call_chain
    result = func(*args)
  File "/Users/buildbot/buildarea/3.14.pablogsal-macos-m1.macos-with-brew/build/Lib/urllib/request.py", line 1556, in ftp_open
    raise URLError(f"ftp error: {exp}") from exp
urllib.error.URLError: <urlopen error ftp error: timed out>

This was referenced Nov 4, 2025
Merged
Open
@Viicos Viicos mentioned this pull request Dec 3, 2025
Merged
5 tasks
Viicos added a commit to pydantic/pydantic that referenced this pull request Dec 4, 2025
@Viicos
Remove xfail marker on a PEP 649 related test (#12609)
53cb5f8 
Thanks to python/cpython#138164 (included in 3.14.1), Python is now able to preserve references when building the forward ref object, and so calling `_eval_type()` on the individual annotations works as expected.
StanFromIreland pushed a commit to StanFromIreland/cpython that referenced this pull request Dec 6, 2025
@JelleZijlstra @StanFromIreland
pythongh-138151: Fix annotationlib handling of multiple nonlocals (py…
552abfa 
…thon#138164)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@JelleZijlstra @bedevere-bot @StanFromIreland