Log message for revision 66203: Merge Merge philikon-fix-lookup-priorities branch and switch Five to version 1.3.3.
Changed: _U Zope/trunk/lib/python/Products/ U Zope/trunk/lib/python/Testing/ZopeTestCase/utils.py U Zope/trunk/lib/python/ZPublisher/Publish.py U Zope/trunk/lib/python/ZPublisher/Test.py -=- Property changes on: Zope/trunk/lib/python/Products ___________________________________________________________________ Name: svn:externals - Five svn://svn.zope.org/repos/main/Products.Five/tags/1.3.2 + Five svn://svn.zope.org/repos/main/Products.Five/tags/1.3.3 Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/utils.py =================================================================== --- Zope/trunk/lib/python/Testing/ZopeTestCase/utils.py 2006-03-26 21:53:20 UTC (rev 66202) +++ Zope/trunk/lib/python/Testing/ZopeTestCase/utils.py 2006-03-26 21:58:06 UTC (rev 66203) @@ -138,6 +138,12 @@ request = Request(sys.stdin, environ, response) request._steps = ['noobject'] # Fake a published object request['ACTUAL_URL'] = request.get('URL') # Zope 2.7.4 + + # set Zope3-style default skin so that the request is usable for + # Zope3-style view look-ups + from zope.app.publication.browser import setDefaultSkin + setDefaultSkin(request) + return app.__of__(RequestContainer(REQUEST=request)) Modified: Zope/trunk/lib/python/ZPublisher/Publish.py =================================================================== --- Zope/trunk/lib/python/ZPublisher/Publish.py 2006-03-26 21:53:20 UTC (rev 66202) +++ Zope/trunk/lib/python/ZPublisher/Publish.py 2006-03-26 21:58:06 UTC (rev 66203) @@ -21,6 +21,7 @@ from maybe_lock import allocate_lock from mapply import mapply from zExceptions import Redirect +from zope.app.publication.browser import setDefaultSkin class Retry(Exception): """Raise this to retry a request @@ -185,6 +186,11 @@ if request is None: request=Request(stdin, environ, response) + # make sure that the request we hand over has the + # default layer/skin set on it; subsequent code that + # wants to look up views will likely depend on it + setDefaultSkin(request) + response = publish(request, module_name, after_list, debug=debug) except SystemExit, v: must_die=sys.exc_info() Modified: Zope/trunk/lib/python/ZPublisher/Test.py =================================================================== --- Zope/trunk/lib/python/ZPublisher/Test.py 2006-03-26 21:53:20 UTC (rev 66202) +++ Zope/trunk/lib/python/ZPublisher/Test.py 2006-03-26 21:58:06 UTC (rev 66203) @@ -189,6 +189,12 @@ stdout=response.stdout if request is None: request=Request(stdin, environ, response) + # make sure that the request we hand over has the + # default layer/skin set on it; subsequent code that + # wants to look up views will likely depend on it + from zope.app.publication.browser import setDefaultSkin + setDefaultSkin(request) + for k, v in extra.items(): request[k]=v response = publish(request, module_name, after_list, debug=debug) except SystemExit, v: _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins