[Python-checkins] r77016 - in python/branches/py3k: Lib/test/test_urllib2.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Dec 24 02:14:05 2009
New Revision: 77016

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_urllib2.py

Modified: python/branches/py3k/Lib/test/test_urllib2.py
==============================================================================
--- python/branches/py3k/Lib/test/test_urllib2.py	(original)
+++ python/branches/py3k/Lib/test/test_urllib2.py	Thu Dec 24 02:14:05 2009
@@ -301,10 +301,11 @@
         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 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)