diff --git a/imporlib.patch b/importlib.patch similarity index 85% rename from imporlib.patch rename to importlib.patch index 0264fa3..00455bb 100644 --- a/imporlib.patch +++ b/importlib.patch @@ -8,7 +8,7 @@ Index: setuptools-41.6.0/setuptools/_imp.py """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) ++ spec = importlib.machinery.PathFinder.find_spec(module, paths) + else: + spec = importlib.util.find_spec(module, paths) if spec is None: @@ -20,7 +20,7 @@ Index: setuptools-41.6.0/setuptools/_imp.py 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) ++ spec = importlib.machinery.PathFinder.find_spec(module, paths) + else: + spec = importlib.util.find_spec(module, paths) if not spec: @@ -31,7 +31,7 @@ Index: setuptools-41.6.0/setuptools/_imp.py 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) ++ spec = importlib.machinery.PathFinder.find_spec(module, paths) + else: + spec = importlib.util.find_spec(module, paths) if not spec: diff --git a/python-setuptools.spec b/python-setuptools.spec index 6bde333..c7b895f 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -36,7 +36,7 @@ Source: https://files.pythonhosted.org/packages/source/s/setuptools/setu Source1: psfl.txt Source2: zpl.txt Patch0: sort-for-reproducibility.patch -Patch1: imporlib.patch +Patch1: importlib.patch BuildRequires: %{python_module appdirs} BuildRequires: %{python_module ordered-set} BuildRequires: %{python_module packaging}