diff options
| author | Anderson Bravalheri <andersonbravalheri@gmail.com> | 2023-01-20 11:13:38 +0000 |
|---|---|---|
| committer | Anderson Bravalheri <andersonbravalheri@gmail.com> | 2023-01-20 11:13:38 +0000 |
| commit | e03f8839a29f0640df7d6f107874aa8fb16c1470 (patch) | |
| tree | bd9b4ccf04fe7e8ba0967941566448b6f61976bc /pkg_resources | |
| parent | d348fdf51fa725d056fc440175f06de8bec5628c (diff) | |
| parent | 87518dd44aa82a44376dbc0a456ba2bed361af1a (diff) | |
| download | python-setuptools-git-e03f8839a29f0640df7d6f107874aa8fb16c1470.tar.gz | |
Flip conditionals around package finders in pkg_resources (#3685)
- In Python 3.3+ importlib.machinery.FileFinder is always present,
therefore we no longer need to keep the conditional
- In Python 3.12+ pkgutil.ImpImporter is removed, so we need a conditional
to avoid using it directly.
Diffstat (limited to 'pkg_resources')
| -rw-r--r-- | pkg_resources/__init__.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index db4879d3..0ae951b6 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -2187,10 +2187,10 @@ 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) +register_finder(importlib_machinery.FileFinder, find_on_path) _declare_state('dict', _namespace_handlers={}) _declare_state('dict', _namespace_packages={}) @@ -2344,11 +2344,11 @@ def file_ns_handler(importer, path_item, packageName, module): return subpath -register_namespace_handler(pkgutil.ImpImporter, file_ns_handler) -register_namespace_handler(zipimport.zipimporter, file_ns_handler) +if hasattr(pkgutil, 'ImpImporter'): + register_namespace_handler(pkgutil.ImpImporter, file_ns_handler) -if hasattr(importlib_machinery, 'FileFinder'): - register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler) +register_namespace_handler(zipimport.zipimporter, file_ns_handler) +register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler) def null_ns_handler(importer, path_item, packageName, module): |