From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 24 Dec 2009 01:18:13 +0000 (+0000)
Subject: Merged revisions 77016 via svnmerge from
X-Git-Tag: v3.1.2rc1~229
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=794921a2ed751f20bd13ec09aae2a3c00d5c8161;p=python

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
  ........
................
---

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index e6c51ecd63..a0fff26f1e 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -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)