diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 8cd5ca0660..d19e116897 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -318,6 +318,9 @@ class MockHTTPClass: def getresponse(self): return MockHTTPResponse(MockFile(), {}, 200, "OK") + def close(self): + pass + class MockHandler: # useful for testing handler machinery # see add_ordered_mock_handlers() docstring diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index e98a97649a..316e0f9353 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1146,6 +1146,8 @@ class AbstractHTTPHandler(BaseHandler): r = h.getresponse() # an HTTPResponse instance except socket.error as err: raise URLError(err) + finally: + h.close() r.url = req.get_full_url() # This line replaces the .msg attribute of the HTTPResponse diff --git a/Misc/NEWS b/Misc/NEWS index 38850c7a51..630b890591 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -193,6 +193,10 @@ Core and Builtins Library ------- +- Issue #12133: AbstractHTTPHandler.do_open() of urllib.request closes the HTTP + connection if its getresponse() method fails with a socket error. Patch + written by Ezio Melotti. + - Issue #12240: Allow multiple setup hooks in packaging's setup.cfg files. Original patch by Erik Bray.