[Checkins] SVN: z3c.layer/trunk/ - Forward-Bug: Due to a bug in mechanize, the testbrowser throws

[Stephan Richter]

Log message for revision 81572:
  - Forward-Bug: Due to a bug in mechanize, the testbrowser throws
    ``httperror_seek_wrapper`` instead of ``HTTPError`` errors. Thanks to RE
    normalizers, the code will now work whether the bug is fixed or not in
    mechanize.
  
  

Changed:
  U   z3c.layer/trunk/CHANGES.txt
  U   z3c.layer/trunk/setup.py
  U   z3c.layer/trunk/src/z3c/layer/minimal/README.txt
  U   z3c.layer/trunk/src/z3c/layer/minimal/tests/test_layer.py
  U   z3c.layer/trunk/src/z3c/layer/pagelet/README.txt
  U   z3c.layer/trunk/src/z3c/layer/pagelet/tests/test_layer.py
  U   z3c.layer/trunk/src/z3c/layer/trusted/README.txt
  U   z3c.layer/trunk/src/z3c/layer/trusted/tests.py

-=-
Modified: z3c.layer/trunk/CHANGES.txt
===================================================================
--- z3c.layer/trunk/CHANGES.txt	2007-11-06 15:28:06 UTC (rev 81571)
+++ z3c.layer/trunk/CHANGES.txt	2007-11-07 05:41:28 UTC (rev 81572)
@@ -2,6 +2,15 @@
 CHANGES
 =======
 
+0.2.3 (2007-11-07)
+------------------
+
+- Forward-Bug: Due to a bug in mechanize, the testbrowser throws
+  ``httperror_seek_wrapper`` instead of ``HTTPError`` errors. Thanks to RE
+  normalizers, the code will now work whether the bug is fixed or not in
+  mechanize.
+
+
 0.2.2 (2007-10-31)
 ------------------
 

Modified: z3c.layer/trunk/setup.py
===================================================================
--- z3c.layer/trunk/setup.py	2007-11-06 15:28:06 UTC (rev 81571)
+++ z3c.layer/trunk/setup.py	2007-11-07 05:41:28 UTC (rev 81572)
@@ -23,7 +23,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name = 'z3c.layer',
-      version = '0.2.2',
+      version = '0.2.3',
       author='Zope Corporation and Contributors',
       author_email='zope3-dev at zope.org',
       description='Collection of Alternative Base Layers',

Modified: z3c.layer/trunk/src/z3c/layer/minimal/README.txt
===================================================================
--- z3c.layer/trunk/src/z3c/layer/minimal/README.txt	2007-11-06 15:28:06 UTC (rev 81571)
+++ z3c.layer/trunk/src/z3c/layer/minimal/README.txt	2007-11-07 05:41:28 UTC (rev 81572)
@@ -72,7 +72,7 @@
   >>> manager.open(skinURL + '/foobar.html')
   Traceback (most recent call last):
   ...
-  httperror_seek_wrapper: HTTP Error 404: Not Found
+  HTTPError: HTTP Error 404: Not Found
 
   >>> print manager.contents
   <BLANKLINE>
@@ -160,7 +160,7 @@
   >>> unauthorized.open(skinURL + '/@@forbidden.html')
   Traceback (most recent call last):
   ...
-  httperror_seek_wrapper: HTTP Error 401: Unauthorized
+  HTTPError: HTTP Error 401: Unauthorized
 
   >>> print unauthorized.contents
   <BLANKLINE>

Modified: z3c.layer/trunk/src/z3c/layer/minimal/tests/test_layer.py
===================================================================
--- z3c.layer/trunk/src/z3c/layer/minimal/tests/test_layer.py	2007-11-06 15:28:06 UTC (rev 81571)
+++ z3c.layer/trunk/src/z3c/layer/minimal/tests/test_layer.py	2007-11-07 05:41:28 UTC (rev 81572)
@@ -14,8 +14,9 @@
 """
 $Id$
 """
-
+import re
 import unittest
+from zope.testing import renormalizing
 from zope.app.testing import functional
 
 functional.defineLayer('TestLayer', 'ftesting.zcml')
@@ -24,7 +25,12 @@
 def test_suite():
     suite = unittest.TestSuite()
 
-    s = functional.FunctionalDocFileSuite('../README.txt')
+    s = functional.FunctionalDocFileSuite(
+        '../README.txt',
+        checker = renormalizing.RENormalizing([
+            (re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
+            ])
+        )
     s.layer = TestLayer
     suite.addTest(s)
 

Modified: z3c.layer/trunk/src/z3c/layer/pagelet/README.txt
===================================================================
--- z3c.layer/trunk/src/z3c/layer/pagelet/README.txt	2007-11-06 15:28:06 UTC (rev 81571)
+++ z3c.layer/trunk/src/z3c/layer/pagelet/README.txt	2007-11-07 05:41:28 UTC (rev 81572)
@@ -76,7 +76,7 @@
   >>> manager.open(skinURL + '/foobar.html')
   Traceback (most recent call last):
   ...
-  httperror_seek_wrapper: HTTP Error 404: Not Found
+  HTTPError: HTTP Error 404: Not Found
 
   >>> print manager.contents
   <!DOCTYPE...
@@ -164,7 +164,7 @@
   >>> unauthorized.open(skinURL + '/@@forbidden.html')
   Traceback (most recent call last):
   ...
-  httperror_seek_wrapper: HTTP Error 401: Unauthorized
+  HTTPError: HTTP Error 401: Unauthorized
 
   >>> print unauthorized.contents
   <!DOCTYPE...

Modified: z3c.layer/trunk/src/z3c/layer/pagelet/tests/test_layer.py
===================================================================
--- z3c.layer/trunk/src/z3c/layer/pagelet/tests/test_layer.py	2007-11-06 15:28:06 UTC (rev 81571)
+++ z3c.layer/trunk/src/z3c/layer/pagelet/tests/test_layer.py	2007-11-07 05:41:28 UTC (rev 81572)
@@ -14,8 +14,9 @@
 """
 $Id: __init__.py 97 2007-03-29 22:58:27Z rineichen $
 """
-
+import re
 import unittest
+from zope.testing import renormalizing
 from zope.app.testing import functional
 
 functional.defineLayer('TestLayer', 'ftesting.zcml')
@@ -23,7 +24,12 @@
 
 def test_suite():
     suite = unittest.TestSuite()
-    s = functional.FunctionalDocFileSuite('../README.txt')
+    s = functional.FunctionalDocFileSuite(
+        '../README.txt',
+        checker = renormalizing.RENormalizing([
+            (re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
+            ])
+        )
     s.layer = TestLayer
     suite.addTest(s)
 

Modified: z3c.layer/trunk/src/z3c/layer/trusted/README.txt
===================================================================
--- z3c.layer/trunk/src/z3c/layer/trusted/README.txt	2007-11-06 15:28:06 UTC (rev 81571)
+++ z3c.layer/trunk/src/z3c/layer/trusted/README.txt	2007-11-07 05:41:28 UTC (rev 81572)
@@ -57,7 +57,7 @@
   >>> manager.open(skinURL + '/foobar.html')
   Traceback (most recent call last):
   ...
-  httperror_seek_wrapper: HTTP Error 404: Not Found
+  HTTPError: HTTP Error 404: Not Found
 
   >>> print manager.contents
   <BLANKLINE>
@@ -145,7 +145,7 @@
   >>> unauthorized.open(skinURL + '/@@forbidden.html')
   Traceback (most recent call last):
   ...
-  httperror_seek_wrapper: HTTP Error 401: Unauthorized
+  HTTPError: HTTP Error 401: Unauthorized
 
   >>> print unauthorized.contents
   <BLANKLINE>

Modified: z3c.layer/trunk/src/z3c/layer/trusted/tests.py
===================================================================
--- z3c.layer/trunk/src/z3c/layer/trusted/tests.py	2007-11-06 15:28:06 UTC (rev 81571)
+++ z3c.layer/trunk/src/z3c/layer/trusted/tests.py	2007-11-07 05:41:28 UTC (rev 81572)
@@ -14,8 +14,9 @@
 """
 $Id$
 """
-
+import re
 import unittest
+from zope.testing import renormalizing
 from zope.app.testing import functional
 
 from z3c.layer import trusted
@@ -34,8 +35,13 @@
 def test_suite():
     suite = unittest.TestSuite()
 
-    s = functional.FunctionalDocFileSuite('README.txt',
-            globs={'getRootFolder': getRootFolder})
+    s = functional.FunctionalDocFileSuite(
+        'README.txt',
+        globs={'getRootFolder': getRootFolder},
+        checker = renormalizing.RENormalizing([
+            (re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
+            ])
+        )
     s.layer = TestLayer
     suite.addTest(s)