[Checkins] SVN: zope.testbrowser/trunk/ Fixes #419119: don't choke and die when the browser doesn't have any contents yet, simply return None instead. Patch by vaab <https://launchpad.net/~valentin-lab>.

[Wolfgang Schnerring]

Log message for revision 103586:
  Fixes #419119: don't choke and die when the browser doesn't have any contents yet, simply return None instead. Patch by vaab <https://launchpad.net/~valentin-lab>.
  

Changed:
  U   zope.testbrowser/trunk/CHANGES.txt
  U   zope.testbrowser/trunk/src/zope/testbrowser/browser.py
  U   zope.testbrowser/trunk/src/zope/testbrowser/tests.py

-=-
Modified: zope.testbrowser/trunk/CHANGES.txt
===================================================================
--- zope.testbrowser/trunk/CHANGES.txt	2009-09-05 09:04:44 UTC (rev 103585)
+++ zope.testbrowser/trunk/CHANGES.txt	2009-09-05 09:34:12 UTC (rev 103586)
@@ -5,6 +5,8 @@
 3.7.0a2 (unreleased)
 --------------------
 
+- Fixed LP #419119: return None when the browser has no contents instead of
+  raising an exception.
 
 3.7.0a1 (2009-08-29)
 --------------------

Modified: zope.testbrowser/trunk/src/zope/testbrowser/browser.py
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/browser.py	2009-09-05 09:04:44 UTC (rev 103585)
+++ zope.testbrowser/trunk/src/zope/testbrowser/browser.py	2009-09-05 09:34:12 UTC (rev 103586)
@@ -198,6 +198,8 @@
         if self._contents is not None:
             return self._contents
         response = self.mech_browser.response()
+        if response is None:
+            return None
         old_location = response.tell()
         response.seek(0)
         self._contents = response.read()

Modified: zope.testbrowser/trunk/src/zope/testbrowser/tests.py
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/tests.py	2009-09-05 09:04:44 UTC (rev 103585)
+++ zope.testbrowser/trunk/src/zope/testbrowser/tests.py	2009-09-05 09:34:12 UTC (rev 103586)
@@ -304,7 +304,20 @@
 
     """
 
+def test_new_instance_no_contents_should_not_fail(self):
+    """
 
+    When first instantiated, the browser has no contents.
+    (Regression test for <http://bugs.launchpad.net/zope3/+bug/419119>)
+
+    >>> browser = Browser()
+    >>> print browser.contents
+    None
+
+    """
+
+
+
 def test_strip_linebreaks_from_textarea(self):
     """