summaryrefslogtreecommitdiff
path: root/pkg_resources
diff options
context:
space:
mode:
authorAnderson Bravalheri <andersonbravalheri@gmail.com>2022-11-15 16:56:05 +0000
committerAnderson Bravalheri <andersonbravalheri@gmail.com>2023-01-18 14:58:16 +0000
commit6653e747c3815b140156249205397ef3719581ee (patch)
treea6dafb34c7b5ff2a614f4c5a54d5d028f82f4476 /pkg_resources
parentca3198a52d48123d4d8e67952f1c9d5abba38d1f (diff)
downloadpython-setuptools-git-6653e747c3815b140156249205397ef3719581ee.tar.gz
Wrap deprecated pkgutil usage in pkg_resources in conditional
Diffstat (limited to 'pkg_resources')
-rw-r--r--pkg_resources/__init__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index bba775b9..ddb9a37d 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2187,7 +2187,8 @@ def resolve_egg_link(path):
return next(dist_groups, ())
-register_finder(pkgutil.ImpImporter, find_on_path)
+if hasattr(pkgutil, 'ImpImporter'):
+ register_finder(pkgutil.ImpImporter, find_on_path)
if hasattr(importlib_machinery, 'FileFinder'):
register_finder(importlib_machinery.FileFinder, find_on_path)
@@ -2344,7 +2345,9 @@ def file_ns_handler(importer, path_item, packageName, module):
return subpath
-register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
+if hasattr(pkgutil, 'ImpImporter'):
+ register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
+
register_namespace_handler(zipimport.zipimporter, file_ns_handler)
if hasattr(importlib_machinery, 'FileFinder'):