From 64e67bf5a3a0eedb06900297fc9baf0e2bc149de Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Sun, 3 Jan 2021 06:58:52 +0800
Subject: [PATCH 1/2] [patch tracking] 20210103065849753943 -
 https://github.com/pypa/pip/commit/47493d82272e48a59278abfa540e6aef7790161b

---
 ...3d82272e48a59278abfa540e6aef7790161b.patch | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 47493d82272e48a59278abfa540e6aef7790161b.patch

diff --git a/47493d82272e48a59278abfa540e6aef7790161b.patch b/47493d82272e48a59278abfa540e6aef7790161b.patch
new file mode 100644
index 0000000..b49d4ab
--- /dev/null
+++ b/47493d82272e48a59278abfa540e6aef7790161b.patch
@@ -0,0 +1,43 @@
+diff --git a/news/2b5d1433-ec03-4b33-8cf1-ff76baa3690e.trivial.rst b/news/2b5d1433-ec03-4b33-8cf1-ff76baa3690e.trivial.rst
+new file mode 100644
+index 0000000000..e69de29bb2
+diff --git a/src/pip/_internal/commands/__init__.py b/src/pip/_internal/commands/__init__.py
+index f0554b655d..f2411201c4 100644
+--- a/src/pip/_internal/commands/__init__.py
++++ b/src/pip/_internal/commands/__init__.py
+@@ -2,20 +2,13 @@
+ Package containing all pip commands
+ """
+ 
+-# The following comment should be removed at some point in the future.
+-# mypy: disallow-untyped-defs=False
+-# There is currently a bug in python/typeshed mentioned at
+-# https://github.com/python/typeshed/issues/3906 which causes the
+-# return type of difflib.get_close_matches to be reported
+-# as List[Sequence[str]] whereas it should have been List[str]
+-
+ import importlib
+ from collections import OrderedDict, namedtuple
+ 
+ from pip._internal.utils.typing import MYPY_CHECK_RUNNING
+ 
+ if MYPY_CHECK_RUNNING:
+-    from typing import Any
++    from typing import Any, Optional
+ 
+     from pip._internal.cli.base_command import Command
+ 
+@@ -108,6 +101,7 @@ def create_command(name, **kwargs):
+ 
+ 
+ def get_similar_commands(name):
++    # type: (str) -> Optional[str]
+     """Command name auto-correct."""
+     from difflib import get_close_matches
+ 
+@@ -118,4 +112,4 @@ def get_similar_commands(name):
+     if close_commands:
+         return close_commands[0]
+     else:
+-        return False
++        return None
-- 
Gitee


From 95b23f02f1f3c3dd7fee2cad8441eca82662e25e Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Sun, 3 Jan 2021 06:58:53 +0800
Subject: [PATCH 2/2] [patch tracking] 20210103065849753943 - update spec file

---
 python-pip.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/python-pip.spec b/python-pip.spec
index 3d035b5..c4c5ac4 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: 47493d82272e48a59278abfa540e6aef7790161b.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
+* 20210103065849753943 patch-tracking 20.2.2-4
+- append patch file of upstream repository from <47493d82272e48a59278abfa540e6aef7790161b> to <47493d82272e48a59278abfa540e6aef7790161b>
+
 * Wed Nov 4 2020 wangjie<wangjie294@huawei.com> -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 <buildteam@openeuler.org> - 18.0-6
-- Package init
+- Package init
\ No newline at end of file
-- 
Gitee