diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-06-17 14:01:18 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-06-17 14:01:18 +0200 |
| commit | a4c45d73cf6eeb8ede6ee701c0372d7e45dc24f2 (patch) | |
| tree | c7bee889bda36c5418ff802a662d10b2f0efa61e /Lib | |
| parent | 0f83b1511c76e892b48b16d656cceb032bdb9cb3 (diff) | |
| download | cpython-git-a4c45d73cf6eeb8ede6ee701c0372d7e45dc24f2.tar.gz | |
Issue #12133: fix a ResourceWarning in urllib.request
AbstractHTTPHandler.do_open() of urllib.request closes the HTTP connection if
its getresponse() method fails with a socket error. Patch written by Ezio
Melotti.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_urllib2.py | 3 | ||||
| -rw-r--r-- | Lib/urllib/request.py | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index e9fb2fc271..58ef83611d 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -317,6 +317,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 5325d62c40..35fd1f136f 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1137,6 +1137,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 |
