Apply workaround on all versions of Python. Fixes #3452.

pypa · Jul 14, 2022 · 03da59c · 03da59c
1 parent 8c9cf2f
commit 03da59c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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: