Skip to content

Commit 839dc59

Browse files
committed
Remove conditional for FileFinder in pkg_resources
FileFiler should always be present in Python 3.3+
1 parent 6653e74 commit 839dc59

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

pkg_resources/__init__.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2190,8 +2190,7 @@ def resolve_egg_link(path):
21902190
if hasattr(pkgutil, 'ImpImporter'):
21912191
register_finder(pkgutil.ImpImporter, find_on_path)
21922192

2193-
if hasattr(importlib_machinery, 'FileFinder'):
2194-
register_finder(importlib_machinery.FileFinder, find_on_path)
2193+
register_finder(importlib_machinery.FileFinder, find_on_path)
21952194

21962195
_declare_state('dict', _namespace_handlers={})
21972196
_declare_state('dict', _namespace_packages={})
@@ -2349,9 +2348,7 @@ def file_ns_handler(importer, path_item, packageName, module):
23492348
register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
23502349

23512350
register_namespace_handler(zipimport.zipimporter, file_ns_handler)
2352-
2353-
if hasattr(importlib_machinery, 'FileFinder'):
2354-
register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler)
2351+
register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler)
23552352

23562353

23572354
def null_ns_handler(importer, path_item, packageName, module):

0 commit comments

Comments
 (0)