[wwwsearch-commits] r29183 - in wwwsearch/mechanize/trunk: . mechanize

[jjlee at codespeak.net]

Author: jjlee
Date: Thu Jun 22 22:53:22 2006
New Revision: 29183

Modified:
   wwwsearch/mechanize/trunk/mechanize/__init__.py
   wwwsearch/mechanize/trunk/mechanize/_mechanize.py
   wwwsearch/mechanize/trunk/test.py
Log:
Fix case where History is .close()d when response is None (benji at zope.com); Expose History in mechanize/__init__.py (though interface is still experimental)

Modified: wwwsearch/mechanize/trunk/mechanize/__init__.py
==============================================================================
--- wwwsearch/mechanize/trunk/mechanize/__init__.py	(original)
+++ wwwsearch/mechanize/trunk/mechanize/__init__.py	Thu Jun 22 22:53:22 2006
@@ -2,7 +2,7 @@
 
 # high-level stateful browser-style interface
 from _mechanize import \
-     Browser, \
+     Browser, History, \
      BrowserStateError, LinkNotFoundError, FormNotFoundError
 
 # configurable URL-opener interface

Modified: wwwsearch/mechanize/trunk/mechanize/_mechanize.py
==============================================================================
--- wwwsearch/mechanize/trunk/mechanize/_mechanize.py	(original)
+++ wwwsearch/mechanize/trunk/mechanize/_mechanize.py	Thu Jun 22 22:53:22 2006
@@ -47,7 +47,8 @@
         del self._history[:]
     def close(self):
         for request, response in self._history:
-            response.close()
+            if response is not None:
+                response.close()
         del self._history[:]
 
 class Browser(UserAgent):

Modified: wwwsearch/mechanize/trunk/test.py
==============================================================================
--- wwwsearch/mechanize/trunk/test.py	(original)
+++ wwwsearch/mechanize/trunk/test.py	Thu Jun 22 22:53:22 2006
@@ -133,6 +133,7 @@
     
     doctest.testfile(os.path.join("test", "test_rfc3986.doctest"))
     doctest.testfile(os.path.join("test", "test_request.doctest"))
+    doctest.testfile(os.path.join("test", "test_history.doctest"))
     from mechanize import _headersutil, _auth, _clientcookie, _pullparser
     doctest.testmod(_headersutil)
     doctest.testmod(_auth)