Updated to the latest version

Author: Alexandr153

Lib/test/test_urllib2.py

@@ -300,7 +300,7 @@ def getheaders(self, name):
 class MockResponse(io.StringIO):
     def __init__(self, code, msg, headers, data, url=None):
         io.StringIO.__init__(self, data)
-        self.code, self.msg, self.headers, self.url = code, msg, headers, url
+        self.status, self.msg, self.headers, self.url = code, msg, headers, url
 
     def info(self):
         return self.headers

Lib/urllib/request.py

@@ -210,7 +210,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.info()
+        headers = fp.headers
 
         # Just return the local path and the "headers" for file://
         # URLs. No sense in performing a copy unless requested.
@@ -594,7 +594,7 @@ class HTTPErrorProcessor(BaseHandler):
     handler_order = 1000  # after all other processing
 
     def http_response(self, request, response):
-        code, msg, hdrs = response.code, response.msg, response.info()
+        code, msg, hdrs = response.status, response.msg, response.headers
 
         # According to RFC 2616, "2xx" code indicates that the client's
         # request was successfully received, understood, and accepted.
@@ -1338,8 +1338,7 @@ def do_open(self, http_class, req, **http_conn_args):
         # This line replaces the .msg attribute of the HTTPResponse
         # with .headers, because urllib clients expect the response to
         # have the reason in .msg.  It would be good to mark this
-        # attribute is deprecated and get then to use info() or
-        # .headers.
+        # attribute is deprecated and get then to use .headers.
         r.msg = r.reason
         return r
 

Misc/ACKS

@@ -1270,6 +1270,7 @@ Dustin J. Mitchell
 Gideon Mitchell
 Tim Mitchell
 Zubin Mithra
+Alexandr Mitin
 Florian Mladitsch
 Kevin Modzelewski
 Doug Moen