From: Benjamin Peterson Date: Thu, 24 Dec 2009 01:13:50 +0000 (+0000) Subject: Merged revisions 77014 via svnmerge from X-Git-Tag: v2.6.5rc1~237 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17e1c127874273b05961462d922429fce395c53f;p=python Merged revisions 77014 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77014 | benjamin.peterson | 2009-12-23 19:09:53 -0600 (Wed, 23 Dec 2009) | 1 line fix alleged refleak ........ --- diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index e7188e4e60..1ecb56e9d7 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -292,10 +292,11 @@ class MockHTTPClass: self._tunnel_headers = headers else: self._tunnel_headers.clear() - def request(self, method, url, body=None, headers={}): + def request(self, method, url, body=None, headers=None): self.method = method self.selector = url - self.req_headers += headers.items() + if headers is not None: + self.req_headers += headers.items() self.req_headers.sort() if body: self.data = body @@ -415,7 +416,11 @@ class MockHTTPHandler(urllib2.BaseHandler): class MockHTTPSHandler(urllib2.AbstractHTTPHandler): # Useful for testing the Proxy-Authorization request by verifying the # properties of httpcon - httpconn = MockHTTPClass() + + def __init__(self): + urllib2.AbstractHTTPHandler.__init__(self) + self.httpconn = MockHTTPClass() + def https_open(self, req): return self.do_open(self.httpconn, req)