Disable brotli import in urllib3

This commit is contained in:
q0w 2022-03-27 16:25:41 +03:00
parent 7d61883000
commit 6689e531d3
2 changed files with 35 additions and 0 deletions

1
news/10950.bugfix.rst Normal file
View File

@ -0,0 +1 @@
Disable brotli import in vendored urllib3.

View File

@ -27,3 +27,37 @@ 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()