Work around cachecontrol incompatibility

Author: uranusjr

src/pip/_vendor/cachecontrol/serialize.py

@@ -51,7 +51,7 @@ def dumps(self, request, response, body=None):
                 u"status": response.status,
                 u"version": response.version,
                 u"reason": text_type(response.reason),
-                u"strict": response.strict,
+                u"strict": True,
                 u"decode_content": response.decode_content,
             }
         }
@@ -137,7 +137,9 @@ def prepare_response(self, request, cached, body_file=None):
             #
             #     TypeError: 'str' does not support the buffer interface
             body = io.BytesIO(body_raw.encode("utf8"))
-
+        # Work around ionrock/cachecontrol#292. According to urllib3 maintainers,
+        # the 'strict' argument can be simply dropped since we always use urllib3 2.x.
+        cached["response"].pop("strict", None)
         return HTTPResponse(body=body, preload_content=False, **cached["response"])
 
     def _loads_v0(self, request, data, body_file=None):

tools/vendoring/patches/cachecontrol-urllib3-compat.patch

@@ -0,0 +1,24 @@
+diff --git a/src/pip/_vendor/cachecontrol/serialize.py b/src/pip/_vendor/cachecontrol/serialize.py
+index 7fe1a3e33..9a4859912 100644
+--- a/src/pip/_vendor/cachecontrol/serialize.py
++++ b/src/pip/_vendor/cachecontrol/serialize.py
+@@ -51,7 +51,7 @@ class Serializer(object):
+                 u"status": response.status,
+                 u"version": response.version,
+                 u"reason": text_type(response.reason),
+-                u"strict": response.strict,
++                u"strict": True,
+                 u"decode_content": response.decode_content,
+             }
+         }
+@@ -137,7 +137,9 @@ class Serializer(object):
+             #
+             #     TypeError: 'str' does not support the buffer interface
+             body = io.BytesIO(body_raw.encode("utf8"))
+-
++        # Work around ionrock/cachecontrol#292. According to urllib3 maintainers,
++        # the 'strict' argument can be simply dropped since we always use urllib3 2.x.
++        cached["response"].pop("strict", None)
+         return HTTPResponse(body=body, preload_content=False, **cached["response"])
+ 
+     def _loads_v0(self, request, data, body_file=None):