fix name of patch
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=187
This commit is contained in:
parent
1900883591
commit
9334e9c089
@ -8,7 +8,7 @@ Index: setuptools-41.6.0/setuptools/_imp.py
|
|||||||
"""Just like 'imp.find_module()', but with package support"""
|
"""Just like 'imp.find_module()', but with package support"""
|
||||||
- spec = importlib.util.find_spec(module, paths)
|
- spec = importlib.util.find_spec(module, paths)
|
||||||
+ if isinstance(paths, list):
|
+ if isinstance(paths, list):
|
||||||
+ spec = importlib.machinery.PathFinder().find_spec(module, paths)
|
+ spec = importlib.machinery.PathFinder.find_spec(module, paths)
|
||||||
+ else:
|
+ else:
|
||||||
+ spec = importlib.util.find_spec(module, paths)
|
+ spec = importlib.util.find_spec(module, paths)
|
||||||
if spec is None:
|
if spec is None:
|
||||||
@ -20,7 +20,7 @@ Index: setuptools-41.6.0/setuptools/_imp.py
|
|||||||
def get_frozen_object(module, paths=None):
|
def get_frozen_object(module, paths=None):
|
||||||
- spec = importlib.util.find_spec(module, paths)
|
- spec = importlib.util.find_spec(module, paths)
|
||||||
+ if isinstance(paths, list):
|
+ if isinstance(paths, list):
|
||||||
+ spec = importlib.machinery.PathFinder().find_spec(module, paths)
|
+ spec = importlib.machinery.PathFinder.find_spec(module, paths)
|
||||||
+ else:
|
+ else:
|
||||||
+ spec = importlib.util.find_spec(module, paths)
|
+ spec = importlib.util.find_spec(module, paths)
|
||||||
if not spec:
|
if not spec:
|
||||||
@ -31,7 +31,7 @@ Index: setuptools-41.6.0/setuptools/_imp.py
|
|||||||
def get_module(module, paths, info):
|
def get_module(module, paths, info):
|
||||||
- spec = importlib.util.find_spec(module, paths)
|
- spec = importlib.util.find_spec(module, paths)
|
||||||
+ if isinstance(paths, list):
|
+ if isinstance(paths, list):
|
||||||
+ spec = importlib.machinery.PathFinder().find_spec(module, paths)
|
+ spec = importlib.machinery.PathFinder.find_spec(module, paths)
|
||||||
+ else:
|
+ else:
|
||||||
+ spec = importlib.util.find_spec(module, paths)
|
+ spec = importlib.util.find_spec(module, paths)
|
||||||
if not spec:
|
if not spec:
|
@ -36,7 +36,7 @@ Source: https://files.pythonhosted.org/packages/source/s/setuptools/setu
|
|||||||
Source1: psfl.txt
|
Source1: psfl.txt
|
||||||
Source2: zpl.txt
|
Source2: zpl.txt
|
||||||
Patch0: sort-for-reproducibility.patch
|
Patch0: sort-for-reproducibility.patch
|
||||||
Patch1: imporlib.patch
|
Patch1: importlib.patch
|
||||||
BuildRequires: %{python_module appdirs}
|
BuildRequires: %{python_module appdirs}
|
||||||
BuildRequires: %{python_module ordered-set}
|
BuildRequires: %{python_module ordered-set}
|
||||||
BuildRequires: %{python_module packaging}
|
BuildRequires: %{python_module packaging}
|
||||||
|
Loading…
Reference in New Issue
Block a user