[Checkins] SVN: zope.testbrowser/branches/benji-remove-mechanize-vendor-import/ checkpoint -- tests pass

[Benji York]

Log message for revision 84894:
  checkpoint -- tests pass
  

Changed:
  U   zope.testbrowser/branches/benji-remove-mechanize-vendor-import/buildout.cfg
  D   zope.testbrowser/branches/benji-remove-mechanize-vendor-import/mechanize/
  U   zope.testbrowser/branches/benji-remove-mechanize-vendor-import/setup.py
  U   zope.testbrowser/branches/benji-remove-mechanize-vendor-import/src/zope/testbrowser/browser.py
  U   zope.testbrowser/branches/benji-remove-mechanize-vendor-import/src/zope/testbrowser/tests.py

-=-
Modified: zope.testbrowser/branches/benji-remove-mechanize-vendor-import/buildout.cfg
===================================================================
--- zope.testbrowser/branches/benji-remove-mechanize-vendor-import/buildout.cfg	2008-03-23 21:05:21 UTC (rev 84893)
+++ zope.testbrowser/branches/benji-remove-mechanize-vendor-import/buildout.cfg	2008-03-23 21:05:50 UTC (rev 84894)
@@ -1,5 +1,5 @@
 [buildout]
-develop = . mechanize
+develop = .
 parts = test interpreter
 index = http://download.zope.org/zope3.4
 

Modified: zope.testbrowser/branches/benji-remove-mechanize-vendor-import/setup.py
===================================================================
--- zope.testbrowser/branches/benji-remove-mechanize-vendor-import/setup.py	2008-03-23 21:05:21 UTC (rev 84893)
+++ zope.testbrowser/branches/benji-remove-mechanize-vendor-import/setup.py	2008-03-23 21:05:50 UTC (rev 84894)
@@ -51,7 +51,7 @@
     tests_require = ['zope.testing'],
     install_requires = [
         'setuptools',
-        #'mechanize', XXX uncomment when we can use a released mechanize again
+        'mechanize',
         'ClientForm',
         'zope.interface',
         'zope.schema',

Modified: zope.testbrowser/branches/benji-remove-mechanize-vendor-import/src/zope/testbrowser/browser.py
===================================================================
--- zope.testbrowser/branches/benji-remove-mechanize-vendor-import/src/zope/testbrowser/browser.py	2008-03-23 21:05:21 UTC (rev 84893)
+++ zope.testbrowser/branches/benji-remove-mechanize-vendor-import/src/zope/testbrowser/browser.py	2008-03-23 21:05:50 UTC (rev 84894)
@@ -75,7 +75,15 @@
         raise ValueError(
             "Supply no more than one of %s as arguments" % description)
 
+def fix_exception_name(e):
+    # mechanize unceremoniously changed the repr of HTTPErrors, in
+    # in order not to break existing doctests, we have to undo that
+    if hasattr(e, '_exc_class_name'):
+        name = e._exc_class_name
+        name = name.rsplit('.', 1)[-1]
+        e.__class__.__name__ = name
 
+
 class SetattrErrorsMixin(object):
     _enable_setattr_errors = False
 
@@ -218,7 +226,11 @@
         self._start_timer()
         try:
             try:
-                self.mech_browser.open(url, data)
+                try:
+                    self.mech_browser.open(url, data)
+                except Exception, e:
+                    fix_exception_name(e)
+                    raise
             except urllib2.HTTPError, e:
                 if e.code >= 200 and e.code <= 299:
                     # 200s aren't really errors

Modified: zope.testbrowser/branches/benji-remove-mechanize-vendor-import/src/zope/testbrowser/tests.py
===================================================================
--- zope.testbrowser/branches/benji-remove-mechanize-vendor-import/src/zope/testbrowser/tests.py	2008-03-23 21:05:21 UTC (rev 84893)
+++ zope.testbrowser/branches/benji-remove-mechanize-vendor-import/src/zope/testbrowser/tests.py	2008-03-23 21:05:50 UTC (rev 84894)
@@ -20,6 +20,7 @@
 from zope.app.testing import functional
 from zope.app.testing.functional import FunctionalDocFileSuite
 from zope.testbrowser import browser
+from zope.testing import doctest
 from zope.testing import renormalizing, doctest
 import httplib
 import mechanize
@@ -380,7 +381,6 @@
     __name__, 'TestBrowserLayer', allow_teardown=True)
 
 def test_suite():
-    from zope.testing import doctest
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     readme = FunctionalDocFileSuite('README.txt', optionflags=flags,
         checker=checker)
@@ -393,4 +393,3 @@
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
-