[Checkins] SVN: zope.testbrowser/branches/3.6/ Fixed LP #419119: return None when the browser has no contents instead of

[Gediminas Paulauskas]

Log message for revision 124525:
  Fixed LP #419119: return None when the browser has no contents instead of
  raising an exception.
  
  Backport r103586
  

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

-=-
Modified: zope.testbrowser/branches/3.6/CHANGES.txt
===================================================================
--- zope.testbrowser/branches/3.6/CHANGES.txt	2012-03-05 20:49:01 UTC (rev 124524)
+++ zope.testbrowser/branches/3.6/CHANGES.txt	2012-03-05 20:59:15 UTC (rev 124525)
@@ -7,6 +7,9 @@
 
 - Fixed Python2.7 compatibility in Browser.handleErrors.
 
+- Fixed LP #419119: return None when the browser has no contents instead of
+  raising an exception.
+
 - Fix tests on Python 2.7
 
 3.6.0a2 (2009-01-31)

Modified: zope.testbrowser/branches/3.6/src/zope/testbrowser/browser.py
===================================================================
--- zope.testbrowser/branches/3.6/src/zope/testbrowser/browser.py	2012-03-05 20:49:01 UTC (rev 124524)
+++ zope.testbrowser/branches/3.6/src/zope/testbrowser/browser.py	2012-03-05 20:59:15 UTC (rev 124525)
@@ -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/branches/3.6/src/zope/testbrowser/tests.py
===================================================================
--- zope.testbrowser/branches/3.6/src/zope/testbrowser/tests.py	2012-03-05 20:49:01 UTC (rev 124524)
+++ zope.testbrowser/branches/3.6/src/zope/testbrowser/tests.py	2012-03-05 20:59:15 UTC (rev 124525)
@@ -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):
     """