Log message for revision 69026: Make Five work with newest zope.testbrowser (on Zope 3.3 branch).
Changed: U Products.Five/trunk/testbrowser.py -=- Modified: Products.Five/trunk/testbrowser.py =================================================================== --- Products.Five/trunk/testbrowser.py 2006-07-07 13:45:53 UTC (rev 69025) +++ Products.Five/trunk/testbrowser.py 2006-07-07 13:48:23 UTC (rev 69026) @@ -6,7 +6,6 @@ import urllib2 import mechanize -import ClientCookie from zope.testbrowser import testing from zope.testbrowser import browser @@ -68,28 +67,23 @@ class PublisherMechanizeBrowser(mechanize.Browser): """Special ``mechanize`` browser using the Zope Publisher HTTP handler.""" - handler_classes = { - # scheme handlers - "http": PublisherHTTPHandler, + default_schemes = ['http'] + default_others = ['_http_error', '_http_request_upgrade', + '_http_default_error'] + default_features = ['_redirect', '_cookies', '_referer', '_refresh', + '_equiv', '_basicauth', '_digestauth', '_seek' ] - "_http_error": ClientCookie.HTTPErrorProcessor, - "_http_request_upgrade": ClientCookie.HTTPRequestUpgradeProcessor, - "_http_default_error": urllib2.HTTPDefaultErrorHandler, + def __init__(self, *args, **kws): + inherited_handlers = ['_unknown', '_http_error', + '_http_request_upgrade', '_http_default_error', '_basicauth', + '_digestauth', '_redirect', '_cookies', '_referer', + '_refresh', '_equiv', '_seek', '_gzip'] - # feature handlers - "_authen": urllib2.HTTPBasicAuthHandler, - "_redirect": ClientCookie.HTTPRedirectHandler, - "_cookies": ClientCookie.HTTPCookieProcessor, - "_refresh": ClientCookie.HTTPRefreshProcessor, - "_referer": mechanize.Browser.handler_classes['_referer'], - "_equiv": ClientCookie.HTTPEquivProcessor, - "_seek": ClientCookie.SeekableProcessor, - } + self.handler_classes = {"http": PublisherHTTPHandler} + for name in inherited_handlers: + self.handler_classes[name] = mechanize.Browser.handler_classes[name] - default_schemes = ["http"] - default_others = ["_http_error", "_http_request_upgrade", - "_http_default_error"] - default_features = ["_authen", "_redirect", "_cookies", "_seek"] + mechanize.Browser.__init__(self, *args, **kws) class Browser(browser.Browser): _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins