Merged revisions 77016 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77016 | benjamin.peterson | 2009-12-23 19:14:05 -0600 (Wed, 23 Dec 2009) | 9 lines

  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
  ........
................
This commit is contained in:
Benjamin Peterson 2009-12-24 01:18:13 +00:00
parent 5330aa5b26
commit 794921a2ed
1 changed files with 8 additions and 3 deletions

View File

@ -301,10 +301,11 @@ class MockHTTPClass:
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
@ -424,7 +425,11 @@ class MockHTTPHandler(urllib.request.BaseHandler):
class MockHTTPSHandler(urllib.request.AbstractHTTPHandler):
# Useful for testing the Proxy-Authorization request by verifying the
# properties of httpcon
httpconn = MockHTTPClass()
def __init__(self):
urllib.request.AbstractHTTPHandler.__init__(self)
self.httpconn = MockHTTPClass()
def https_open(self, req):
return self.do_open(self.httpconn, req)