diff --git a/2fb341aac73823635fbe58a0dd878a7960efda95.patch b/2fb341aac73823635fbe58a0dd878a7960efda95.patch new file mode 100644 index 0000000000000000000000000000000000000000..6b39489062ea94a0656a92c994f3d90d5bd8ec2b --- /dev/null +++ b/2fb341aac73823635fbe58a0dd878a7960efda95.patch @@ -0,0 +1,43 @@ +diff --git a/news/d96bbdcd-059a-4ea4-b02e-343f8b51aad5.trivial.rst b/news/d96bbdcd-059a-4ea4-b02e-343f8b51aad5.trivial.rst +new file mode 100644 +index 0000000000..e69de29bb2 +diff --git a/src/pip/_internal/network/session.py b/src/pip/_internal/network/session.py +index c4ac889e28..2b78015400 100644 +--- a/src/pip/_internal/network/session.py ++++ b/src/pip/_internal/network/session.py +@@ -340,8 +340,7 @@ def add_trusted_host(self, host, source=None, suppress_logging=False): + + def iter_secure_origins(self): + # type: () -> Iterator[SecureOrigin] +- for secure_origin in SECURE_ORIGINS: +- yield secure_origin ++ yield from SECURE_ORIGINS + for host, port in self.pip_trusted_origins: + yield ('*', host, '*' if port is None else port) + +diff --git a/src/pip/_internal/req/req_file.py b/src/pip/_internal/req/req_file.py +index 087129613d..5e1f71324d 100644 +--- a/src/pip/_internal/req/req_file.py ++++ b/src/pip/_internal/req/req_file.py +@@ -334,8 +334,7 @@ def parse(self, filename, constraint): + # type: (str, bool) -> Iterator[ParsedLine] + """Parse a given file, yielding parsed lines. + """ +- for line in self._parse_and_recurse(filename, constraint): +- yield line ++ yield from self._parse_and_recurse(filename, constraint) + + def _parse_and_recurse(self, filename, constraint): + # type: (str, bool) -> Iterator[ParsedLine] +@@ -363,10 +362,7 @@ def _parse_and_recurse(self, filename, constraint): + os.path.dirname(filename), req_path, + ) + +- for inner_line in self._parse_and_recurse( +- req_path, nested_constraint, +- ): +- yield inner_line ++ yield from self._parse_and_recurse(req_path, nested_constraint) + else: + yield line + diff --git a/python-pip.spec b/python-pip.spec index 3d035b59a33f24b5c58f6925acf4d9cb6a79f840..e65aca3126e822f31c0d831f0b5e927cc2a24ec8 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -6,7 +6,7 @@ pip is the package installer for Python. You can use pip to install packages fro %global bashcompdir %(b=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null); echo ${b:-%{_sysconfdir}/bash_completion.d}) Name: python-%{srcname} Version: 20.2.2 -Release: 3 +Release: 4 Summary: A tool for installing and managing Python packages License: MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD) URL: http://www.pip-installer.org @@ -16,6 +16,7 @@ Patch1: allow-stripping-given-prefix-from-wheel-RECORD-files.patch Patch2: emit-a-warning-when-running-with-root-privileges.patch Patch3: remove-existing-dist-only-if-path-conflicts.patch Patch6000: dummy-certifi.patch +Patch6001: 2fb341aac73823635fbe58a0dd878a7960efda95.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -112,6 +113,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201227005849754791 patch-tracking 20.2.2-4 +- append patch file of upstream repository from <2fb341aac73823635fbe58a0dd878a7960efda95> to <2fb341aac73823635fbe58a0dd878a7960efda95> + * Wed Nov 4 2020 wangjie -20.2.2-3 - Type:NA - ID:NA @@ -161,4 +165,4 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} - DESC: Synchronize a patch * Mon Sep 23 2019 openEuler Buildteam - 18.0-6 -- Package init +- Package init \ No newline at end of file