Merge pull request #4097 from Avasam/importlib_machinery

Remove possibly redundant `importlib_machinery` code

newsfragments/4097.feature.rst

@@ -0,0 +1 @@
+Updated `pkg_resources` to use stdlib `importlib.machinery` instead of ``importlib_machinery`` -- by :user:`Avasam`

pkg_resources/__init__.py

@@ -45,6 +45,7 @@
 import ntpath
 import posixpath
 import importlib
+import importlib.machinery
 from pkgutil import get_importer
 
 import _imp
@@ -63,14 +64,6 @@
 from os import open as os_open
 from os.path import isdir, split
 
-try:
-    import importlib.machinery as importlib_machinery
-
-    # access attribute to force import under delayed import mechanisms.
-    importlib_machinery.__name__
-except ImportError:
-    importlib_machinery = None
-
 from pkg_resources.extern.jaraco.text import (
     yield_lines,
     drop_comment,
@@ -1724,7 +1717,7 @@ def _register(cls):
             'SourcelessFileLoader',
         )
         for name in loader_names:
-            loader_cls = getattr(importlib_machinery, name, type(None))
+            loader_cls = getattr(importlib.machinery, name, type(None))
             register_loader_type(loader_cls, cls)
 
 
@@ -2219,7 +2212,7 @@ def resolve_egg_link(path):
 if hasattr(pkgutil, 'ImpImporter'):
     register_finder(pkgutil.ImpImporter, find_on_path)
 
-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={})
@@ -2386,7 +2379,7 @@ def file_ns_handler(importer, path_item, packageName, module):
     register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
 
 register_namespace_handler(zipimport.zipimporter, file_ns_handler)
-register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler)
+register_namespace_handler(importlib.machinery.FileFinder, file_ns_handler)
 
 
 def null_ns_handler(importer, path_item, packageName, module):