[wwwsearch-commits] r22696 - in wwwsearch/ClientCookie/trunk: ClientCookie test

[jjlee at codespeak.net]

Author: jjlee
Date: Thu Jan 26 21:58:07 2006
New Revision: 22696

Modified:
   wwwsearch/ClientCookie/trunk/ClientCookie/_Util.py
   wwwsearch/ClientCookie/trunk/test/test_misc.py
   wwwsearch/ClientCookie/trunk/test/test_urllib2.py
Log:
Support multiple .close() calls on response_seek_wrapper (Titus Brown <titus at caltech.edu>); Fix some tests

Modified: wwwsearch/ClientCookie/trunk/ClientCookie/_Util.py
==============================================================================
--- wwwsearch/ClientCookie/trunk/ClientCookie/_Util.py	(original)
+++ wwwsearch/ClientCookie/trunk/ClientCookie/_Util.py	Thu Jan 26 21:58:07 2006
@@ -556,6 +556,7 @@
     def readline(self, size=-1): return ""
     def __iter__(self): return self
     def next(self): return ""
+    def close(self): pass
 
 class response_seek_wrapper(seek_wrapper):
     """Avoids unnecessarily clobbering urllib.addinfourl methods on .close().
@@ -571,6 +572,7 @@
     .geturl()
     .__iter__()
     .next()
+    .close()
 
     and the following attributes are supported if present (i.e. in Python 2.4
     or newer):

Modified: wwwsearch/ClientCookie/trunk/test/test_misc.py
==============================================================================
--- wwwsearch/ClientCookie/trunk/test/test_misc.py	(original)
+++ wwwsearch/ClientCookie/trunk/test/test_misc.py	Thu Jan 26 21:58:07 2006
@@ -33,6 +33,9 @@
         self.headers = headers
         self.url = "http://example.com/"
 
+    def geturl(self):
+        return self.url
+
     def info(self):
         return self.headers
 
@@ -173,6 +176,10 @@
         self.assertEqual(rsw.info(), rsw2.info())
         self.assert_(rsw.info() is not rsw2.info())
 
+        # should be able to close already-closed object
+        rsw2.close()
+        rsw2.close()
+
     def testSetResponseData(self):
         from ClientCookie import response_seek_wrapper
         r = TestUnSeekableResponse(self.text, {'blah': 'yawn'})

Modified: wwwsearch/ClientCookie/trunk/test/test_urllib2.py
==============================================================================
--- wwwsearch/ClientCookie/trunk/test/test_urllib2.py	(original)
+++ wwwsearch/ClientCookie/trunk/test/test_urllib2.py	Thu Jan 26 21:58:07 2006
@@ -668,6 +668,7 @@
             code = 200
             msg = "OK"
             def info(self): pass
+            def geturl(self): return ""
         r = MockUnseekableResponse()
         newr = h.http_response(req, r)
         self.assert_(not hasattr(r, "seek"))