diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2022-07-14 12:07:48 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2022-07-14 12:07:48 -0400 |
| commit | 03da59c07d0e93d67523356821acc66b34fa5c5c (patch) | |
| tree | 15e293a0354c29dc0b0a65b00445b311c238e73d | |
| parent | 8c9cf2f0e5ce5b6630e38a5fd1105fcfb2252348 (diff) | |
| download | python-setuptools-git-bugfix/3452-unconditional-workaround.tar.gz | |
Apply workaround on all versions of Python. Fixes #3452.bugfix/3452-unconditional-workaround
| -rw-r--r-- | setuptools/_importlib.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/setuptools/_importlib.py b/setuptools/_importlib.py index 819bf5d3..400cf60a 100644 --- a/setuptools/_importlib.py +++ b/setuptools/_importlib.py @@ -6,7 +6,7 @@ def disable_importlib_metadata_finder(metadata): Ensure importlib_metadata doesn't provide older, incompatible Distributions. - Workaround for #3102. + Workaround for #3102 and #3452. """ try: import importlib_metadata @@ -36,11 +36,13 @@ def disable_importlib_metadata_finder(metadata): if sys.version_info < (3, 10): from setuptools.extern import importlib_metadata as metadata - disable_importlib_metadata_finder(metadata) else: import importlib.metadata as metadata # noqa: F401 +disable_importlib_metadata_finder(metadata) + + if sys.version_info < (3, 9): from setuptools.extern import importlib_resources as resources else: |