Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions newsfragments/4097.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updated `pkg_resources` to use stdlib `importlib.machinery` instead of `importlib_machinery` -- by :user:`Avasam`
15 changes: 4 additions & 11 deletions pkg_resources/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import ntpath
import posixpath
import importlib
import importlib.machinery
from pkgutil import get_importer

try:
Expand Down Expand Up @@ -68,14 +69,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,
Expand Down Expand Up @@ -1734,7 +1727,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)


Expand Down Expand Up @@ -2229,7 +2222,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={})
Expand Down Expand Up @@ -2396,7 +2389,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):
Expand Down