Accept response objects which only provide the deprecated attributes

Author: serhiy-storchaka

Lib/test/test_urllib2.py

@@ -309,6 +309,21 @@ def geturl(self):
         return self.url
 
 
+class MockLegacyResponse(io.StringIO):
+    # A response object written before the status attribute and the headers
+    # attribute were added in 3.9 (gh-123503).
+    def __init__(self, code, msg, headers, data, url=None):
+        io.StringIO.__init__(self, data)
+        self.code, self.msg, self.url = code, msg, url
+        self._headers = headers
+
+    def info(self):
+        return self._headers
+
+    def geturl(self):
+        return self.url
+
+
 class MockCookieJar:
     def add_cookie_header(self, request):
         self.ach_req = request
@@ -1230,6 +1245,14 @@ def test_fixpath_in_weirdurls(self):
         self.assertEqual(newreq.selector, '')
 
     def test_errors(self):
+        self._test_errors(MockResponse)
+
+    def test_errors_legacy_response(self):
+        # A response object providing only the attributes deprecated in 3.9
+        # is still accepted (gh-123503).
+        self._test_errors(MockLegacyResponse)
+
+    def _test_errors(self, MockResponse):
         h = urllib.request.HTTPErrorProcessor()
         o = h.parent = MockOpener()
 

Lib/urllib/request.py

@@ -190,6 +190,24 @@ def install_opener(opener):
     global _opener
     _opener = opener
 
+def _get_status(response):
+    # Handlers can return any response object, and one written before the
+    # status attribute was added in 3.9 only provides the deprecated code
+    # attribute (gh-123503).
+    try:
+        return response.status
+    except AttributeError:
+        return response.code
+
+
+def _get_headers(response):
+    # Likewise, such a response only provides the deprecated info() method.
+    try:
+        return response.headers
+    except AttributeError:
+        return response.info()
+
+
 _url_tempfiles = []
 def urlretrieve(url, filename=None, reporthook=None, data=None):
     """
@@ -210,7 +228,7 @@ def urlretrieve(url, filename=None, reporthook=None, data=None):
     url_type, path = _splittype(url)
 
     with contextlib.closing(urlopen(url, data)) as fp:
-        headers = fp.headers
+        headers = _get_headers(fp)
 
         # Just return the local path and the "headers" for file://
         # URLs. No sense in performing a copy unless requested.
@@ -596,7 +614,9 @@ class HTTPErrorProcessor(BaseHandler):
     handler_order = 1000  # after all other processing
 
     def http_response(self, request, response):
-        code, msg, hdrs = response.status, response.msg, response.headers
+        code = _get_status(response)
+        msg = response.msg
+        hdrs = _get_headers(response)
 
         # According to RFC 2616, "2xx" code indicates that the client's
         # request was successfully received, understood, and accepted.
@@ -1008,7 +1028,7 @@ def http_request(self, req):
 
     def http_response(self, req, response):
         if hasattr(self.passwd, 'is_authenticated'):
-            if 200 <= response.status < 300:
+            if 200 <= _get_status(response) < 300:
                 self.passwd.update_authenticated(req.full_url, True)
             else:
                 self.passwd.update_authenticated(req.full_url, False)