diff options
| author | Pradyun Gedam <pgedam@bloomberg.net> | 2022-04-22 15:46:11 +0100 |
|---|---|---|
| committer | Pradyun Gedam <pgedam@bloomberg.net> | 2022-04-22 15:50:29 +0100 |
| commit | 377d642384befe47e96e87550d9a12cbe8f13413 (patch) | |
| tree | d474fe20cb825df21cb0988dc973facc73ab02d0 /tools | |
| parent | dfcac4add2801ea078f976b8fba3b24fa246c1ce (diff) | |
| download | pip-377d642384befe47e96e87550d9a12cbe8f13413.tar.gz | |
Upgrade rich to 12.2.0
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/vendoring/patches/urllib3-disable-brotli.patch | 39 | ||||
| -rw-r--r-- | tools/vendoring/patches/urllib3.patch | 34 |
2 files changed, 39 insertions, 34 deletions
diff --git a/tools/vendoring/patches/urllib3-disable-brotli.patch b/tools/vendoring/patches/urllib3-disable-brotli.patch new file mode 100644 index 000000000..1058ac479 --- /dev/null +++ b/tools/vendoring/patches/urllib3-disable-brotli.patch @@ -0,0 +1,39 @@ +diff --git a/src/pip/_vendor/urllib3/response.py b/src/pip/_vendor/urllib3/response.py +index fdb50ddb2..db259d6ce 100644 +--- a/src/pip/_vendor/urllib3/response.py ++++ b/src/pip/_vendor/urllib3/response.py +@@ -7,13 +7,7 @@ + from socket import error as SocketError + from socket import timeout as SocketTimeout + +-try: +- try: +- import brotlicffi as brotli +- except ImportError: +- import brotli +-except ImportError: +- brotli = None ++brotli = None + + from ._collections import HTTPHeaderDict + from .connection import BaseSSLError, HTTPException +diff --git a/src/pip/_vendor/urllib3/util/request.py b/src/pip/_vendor/urllib3/util/request.py +index b574b081e..330766ef4 100644 +--- a/src/pip/_vendor/urllib3/util/request.py ++++ b/src/pip/_vendor/urllib3/util/request.py +@@ -13,15 +13,6 @@ + SKIPPABLE_HEADERS = frozenset(["accept-encoding", "host", "user-agent"]) + + ACCEPT_ENCODING = "gzip,deflate" +-try: +- try: +- import brotlicffi as _unused_module_brotli # noqa: F401 +- except ImportError: +- import brotli as _unused_module_brotli # noqa: F401 +-except ImportError: +- pass +-else: +- ACCEPT_ENCODING += ",br" + + _FAILEDTELL = object() + diff --git a/tools/vendoring/patches/urllib3.patch b/tools/vendoring/patches/urllib3.patch index 747b81e1d..3ca7226fa 100644 --- a/tools/vendoring/patches/urllib3.patch +++ b/tools/vendoring/patches/urllib3.patch @@ -27,37 +27,3 @@ index c43146279..4cded53f6 100644 + pyopenssl.inject_into_urllib3() except ImportError: pass - -diff --git a/src/pip/_vendor/urllib3/response.py b/src/pip/_vendor/urllib3/response.py -index 38693f4fc..776e49dd2 100644 ---- a/src/pip/_vendor/urllib3/response.py -+++ b/src/pip/_vendor/urllib3/response.py -@@ -7,10 +7,7 @@ from contextlib import contextmanager - from socket import error as SocketError - from socket import timeout as SocketTimeout - --try: -- import brotli --except ImportError: -- brotli = None -+brotli = None - - from ._collections import HTTPHeaderDict - from .connection import BaseSSLError, HTTPException -diff --git a/src/pip/_vendor/urllib3/util/request.py b/src/pip/_vendor/urllib3/util/request.py -index 25103383e..330766ef4 100644 ---- a/src/pip/_vendor/urllib3/util/request.py -+++ b/src/pip/_vendor/urllib3/util/request.py -@@ -13,12 +13,6 @@ SKIP_HEADER = "@@@SKIP_HEADER@@@" - SKIPPABLE_HEADERS = frozenset(["accept-encoding", "host", "user-agent"]) - - ACCEPT_ENCODING = "gzip,deflate" --try: -- import brotli as _unused_module_brotli # noqa: F401 --except ImportError: -- pass --else: -- ACCEPT_ENCODING += ",br" - - _FAILEDTELL = object() - |