Skip to content

Commit 2012b1c

Browse files
committed
Remove conditional for FileFinder in pkg_resources
FileFiler should always be present in Python 3.3+
1 parent 444756f commit 2012b1c

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
@@ -2191,8 +2191,7 @@ def resolve_egg_link(path):
21912191
if hasattr(pkgutil, 'ImpImporter'):
21922192
register_finder(pkgutil.ImpImporter, find_on_path)
21932193

2194-
if hasattr(importlib_machinery, 'FileFinder'):
2195-
register_finder(importlib_machinery.FileFinder, find_on_path)
2194+
register_finder(importlib_machinery.FileFinder, find_on_path)
21962195

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

23522351
register_namespace_handler(zipimport.zipimporter, file_ns_handler)
2353-
2354-
if hasattr(importlib_machinery, 'FileFinder'):
2355-
register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler)
2352+
register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler)
23562353

23572354

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

0 commit comments

Comments
 (0)