[Zope-Checkins] SVN: Zope/trunk/src/Testing/testbrowser.py Merge r112803 from 2.12 branch

[Wichert Akkerman]

Log message for revision 112804:
  Merge r112803 from 2.12 branch

Changed:
  U   Zope/trunk/src/Testing/testbrowser.py

-=-
Modified: Zope/trunk/src/Testing/testbrowser.py
===================================================================
--- Zope/trunk/src/Testing/testbrowser.py	2010-05-28 15:42:05 UTC (rev 112803)
+++ Zope/trunk/src/Testing/testbrowser.py	2010-05-28 15:45:30 UTC (rev 112804)
@@ -93,15 +93,10 @@
                         '_equiv', '_basicauth', '_digestauth' ]
 
     def __init__(self, *args, **kws):
-        inherited_handlers = ['_unknown', '_http_error',
-            '_http_request_upgrade', '_http_default_error', '_basicauth',
-            '_digestauth', '_redirect', '_cookies', '_referer',
-            '_refresh', '_equiv', '_gzip']
-
-        self.handler_classes = {"http": PublisherHTTPHandler}
-        for name in inherited_handlers:
-            self.handler_classes[name] = mechanize.Browser.handler_classes[name]
-
+        self.handler_classes = mechanize.Browser.handler_classes.copy()
+        self.handler_classes["http"] = PublisherHTTPHandler
+        self.default_others = [cls for cls in self.default_others 
+                               if cls in mechanize.Browser.handler_classes]
         mechanize.Browser.__init__(self, *args, **kws)