[Zope3-checkins] SVN: Zope3/branches/benji-integrate-new-mechanize/src/ fix remaining test failure

[Benji York]

Log message for revision 68766:
  fix remaining test failure
  

Changed:
  U   Zope3/branches/benji-integrate-new-mechanize/src/mechanize/_mechanize.py
  U   Zope3/branches/benji-integrate-new-mechanize/src/zope/app/apidoc/codemodule/browser/introspector.txt
  U   Zope3/branches/benji-integrate-new-mechanize/src/zope/testbrowser/README.txt
  U   Zope3/branches/benji-integrate-new-mechanize/src/zope/testbrowser/browser.py

-=-
Modified: Zope3/branches/benji-integrate-new-mechanize/src/mechanize/_mechanize.py
===================================================================
--- Zope3/branches/benji-integrate-new-mechanize/src/mechanize/_mechanize.py	2006-06-19 20:29:47 UTC (rev 68765)
+++ Zope3/branches/benji-integrate-new-mechanize/src/mechanize/_mechanize.py	2006-06-20 00:01:45 UTC (rev 68766)
@@ -186,7 +186,6 @@
 
         success = True
         try:
-#            if 'non-existent' in url: import pdb;pdb.set_trace()
             response = UserAgent.open(self, self.request, data)
         except urllib2.HTTPError, error:
             success = False

Modified: Zope3/branches/benji-integrate-new-mechanize/src/zope/app/apidoc/codemodule/browser/introspector.txt
===================================================================
--- Zope3/branches/benji-integrate-new-mechanize/src/zope/app/apidoc/codemodule/browser/introspector.txt	2006-06-19 20:29:47 UTC (rev 68765)
+++ Zope3/branches/benji-integrate-new-mechanize/src/zope/app/apidoc/codemodule/browser/introspector.txt	2006-06-20 00:01:45 UTC (rev 68766)
@@ -12,7 +12,7 @@
     >>> browser.handleErrors = False
 
     >>> browser.open('http://localhost/manage')
-    >>> browser.getLink('Introspector').click() # XXX error here
+    >>> browser.getLink('Introspector').click()
 
 The page starts with telling you the class/type
 

Modified: Zope3/branches/benji-integrate-new-mechanize/src/zope/testbrowser/README.txt
===================================================================
--- Zope3/branches/benji-integrate-new-mechanize/src/zope/testbrowser/README.txt	2006-06-19 20:29:47 UTC (rev 68765)
+++ Zope3/branches/benji-integrate-new-mechanize/src/zope/testbrowser/README.txt	2006-06-20 00:01:45 UTC (rev 68766)
@@ -283,7 +283,7 @@
     >>> browser.url
     'http://localhost/@@/testbrowser/notitle.html'
     >>> browser.goBack()
-    >>> browser.url # XXX ERROR HERE
+    >>> browser.url
     'http://localhost/@@/testbrowser/simple.html'
 
 

Modified: Zope3/branches/benji-integrate-new-mechanize/src/zope/testbrowser/browser.py
===================================================================
--- Zope3/branches/benji-integrate-new-mechanize/src/zope/testbrowser/browser.py	2006-06-19 20:29:47 UTC (rev 68765)
+++ Zope3/branches/benji-integrate-new-mechanize/src/zope/testbrowser/browser.py	2006-06-20 00:01:45 UTC (rev 68766)
@@ -233,12 +233,9 @@
         if 'Status' in self.headers:
             code, msg = self.headers['Status'].split(' ', 1)
             code = int(code)
-            fp = self.mech_browser.open(self.mech_browser.request)
             if code >= 400:
-                raise urllib2.HTTPError(url, code, msg, self.headers, fp)
+                raise urllib2.HTTPError(url, code, msg, self.headers, fp=None)
 
-#            if code >= 300: import pdb;pdb.set_trace()
-
     def _start_timer(self):
         self.timer.start()
 
@@ -301,7 +298,6 @@
         matches = re.compile(r'(^|\b|\W)%s(\b|\W|$)'
                              % re.escape(compressText(label))).search
         found = []
-#        import pdb;pdb.set_trace()
         for f in forms:
             for control in f.controls:
                 phantom = control.type in ('radio', 'checkbox')
@@ -325,7 +321,6 @@
                         if matches(l.text):
                             found.append((control, f))
                             break
-#        if len(found) > 1: import pdb;pdb.set_trace()
         return found
 
     def _findByName(self, name, forms):