diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-python/setuptools/files | |
parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) |
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-python/setuptools/files')
-rw-r--r-- | dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch b/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch new file mode 100644 index 000000000000..5c96016c92c3 --- /dev/null +++ b/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch @@ -0,0 +1,51 @@ +From bbf825eee764cae0bc44077ccc957a733d53d095 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= + <mimi1vx@users.noreply.github.com> +Date: Fri, 15 Nov 2019 08:52:35 +0100 +Subject: [PATCH] Fix _imp module behaviour if is defined paths in find_spec + call + +fixes #1896 +--- + setuptools/_imp.py | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/setuptools/_imp.py b/setuptools/_imp.py +index a3cce9b28..6ccec5799 100644 +--- a/setuptools/_imp.py ++++ b/setuptools/_imp.py +@@ -19,7 +19,10 @@ + + def find_module(module, paths=None): + """Just like 'imp.find_module()', but with package support""" +- spec = importlib.util.find_spec(module, paths) ++ if isinstance(paths, list): ++ spec = importlib.machinery.PathFinder().find_spec(module, paths) ++ else: ++ spec = importlib.util.find_spec(module, paths) + if spec is None: + raise ImportError("Can't find %s" % module) + if not spec.has_location and hasattr(spec, 'submodule_search_locations'): +@@ -60,14 +63,20 @@ def find_module(module, paths=None): + + + def get_frozen_object(module, paths=None): +- spec = importlib.util.find_spec(module, paths) ++ if isinstance(paths, list): ++ spec = importlib.machinery.PathFinder().find_spec(module, paths) ++ else: ++ spec = importlib.util.find_spec(module, paths) + if not spec: + raise ImportError("Can't find %s" % module) + return spec.loader.get_code(module) + + + def get_module(module, paths, info): +- spec = importlib.util.find_spec(module, paths) ++ if isinstance(paths, list): ++ spec = importlib.machinery.PathFinder().find_spec(module, paths) ++ else: ++ spec = importlib.util.find_spec(module, paths) + if not spec: + raise ImportError("Can't find %s" % module) + return module_from_spec(spec) |