From cc01c94bc14c58184e6722c96f1b983a149b846e Mon Sep 17 00:00:00 2001 From: Avasam Date: Fri, 27 Oct 2023 17:14:18 -0400 Subject: [PATCH 1/4] Remove possibly redundant importlib_machinery code --- pkg_resources/__init__.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 3baa1f3c24..3c1f1875c5 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -41,6 +41,7 @@ import ntpath import posixpath import importlib +import importlib.machinery from pkgutil import get_importer try: @@ -68,13 +69,9 @@ 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 +# access attribute to force import under delayed import mechanisms. +importlib.machinery.__name__ from pkg_resources.extern.jaraco.text import ( yield_lines, @@ -1734,7 +1731,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) @@ -2231,7 +2228,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={}) @@ -2398,7 +2395,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): From 0ace7f4de19305092e5961c1ce13cbfbdc8522b9 Mon Sep 17 00:00:00 2001 From: Avasam Date: Mon, 6 Nov 2023 21:15:31 -0500 Subject: [PATCH 2/4] Fix Ruff test --- pkg_resources/__init__.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 3c1f1875c5..aaf9304e9b 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -69,10 +69,6 @@ from os import open as os_open from os.path import isdir, split - -# access attribute to force import under delayed import mechanisms. -importlib.machinery.__name__ - from pkg_resources.extern.jaraco.text import ( yield_lines, drop_comment, From ca12a0bf2ececdc74738ce713a3edaa1b906d503 Mon Sep 17 00:00:00 2001 From: Avasam Date: Tue, 7 Nov 2023 19:15:07 -0500 Subject: [PATCH 3/4] Add newsfragment --- newsfragments/4097.feature.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/4097.feature.rst diff --git a/newsfragments/4097.feature.rst b/newsfragments/4097.feature.rst new file mode 100644 index 0000000000..129e128f21 --- /dev/null +++ b/newsfragments/4097.feature.rst @@ -0,0 +1 @@ +Updated `pkg_resources` to use stdlib `importlib.machinery` instead of `importlib_machinery` -- by :user:`Avasam` From 7362e570ac8fa157a451ee1d3f205839ee89aed9 Mon Sep 17 00:00:00 2001 From: Avasam Date: Tue, 21 Nov 2023 20:03:29 -0500 Subject: [PATCH 4/4] Update newsfragments/4097.feature.rst --- newsfragments/4097.feature.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newsfragments/4097.feature.rst b/newsfragments/4097.feature.rst index 129e128f21..3380658e8c 100644 --- a/newsfragments/4097.feature.rst +++ b/newsfragments/4097.feature.rst @@ -1 +1 @@ -Updated `pkg_resources` to use stdlib `importlib.machinery` instead of `importlib_machinery` -- by :user:`Avasam` +Updated `pkg_resources` to use stdlib `importlib.machinery` instead of ``importlib_machinery`` -- by :user:`Avasam`