https://github.com/python/cpython/commit/fed501d7247053ce46a2ba512bf0e4bb4f483be6 commit: fed501d7247053ce46a2ba512bf0e4bb4f483be6 branch: main author: Sam Gross <[email protected]> committer: colesbury <[email protected]> date: 2024-10-24T18:12:51-04:00 summary:
gh-125245: Fix race condition when importing `collections.abc` (#125415) If multiple threads concurrently imported `collections.abc`, some of the threads might incorrectly see the "shim" `Lib/collections/abc.py` module instead of the correct `Lib/_collections_abc.py` module. This affected both the free threading build and the default GIL-enabled build. files: A Misc/NEWS.d/next/Library/2024-10-11-00-40-13.gh-issue-125245.8vReM-.rst D Lib/collections/abc.py M Lib/collections/__init__.py diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py index b47e728484c8ac..d688141f9b183d 100644 --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -29,6 +29,9 @@ import _collections_abc import sys as _sys +_sys.modules['collections.abc'] = _collections_abc +abc = _collections_abc + from itertools import chain as _chain from itertools import repeat as _repeat from itertools import starmap as _starmap diff --git a/Lib/collections/abc.py b/Lib/collections/abc.py deleted file mode 100644 index 034ba377a0dbec..00000000000000 --- a/Lib/collections/abc.py +++ /dev/null @@ -1,3 +0,0 @@ -import _collections_abc -import sys -sys.modules[__name__] = _collections_abc diff --git a/Misc/NEWS.d/next/Library/2024-10-11-00-40-13.gh-issue-125245.8vReM-.rst b/Misc/NEWS.d/next/Library/2024-10-11-00-40-13.gh-issue-125245.8vReM-.rst new file mode 100644 index 00000000000000..c880efe73d06b4 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-10-11-00-40-13.gh-issue-125245.8vReM-.rst @@ -0,0 +1,2 @@ +Fix race condition when importing :mod:`collections.abc`, which could +incorrectly return an empty module. _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3/lists/python-checkins.python.org/ Member address: [email protected]
