[Checkins] SVN: Zope/trunk/ Caught up with the latest and greatest from the Zope Toolkit again
Hanno Schlichting
hannosch at hannosch.eu
Sun Apr 26 10:59:14 EDT 2009
Log message for revision 99525:
Caught up with the latest and greatest from the Zope Toolkit again
Changed:
U Zope/trunk/alltests.cfg
A Zope/trunk/dependencies.cfg
U Zope/trunk/src/Products/Five/browser/configure.zcml
U Zope/trunk/src/Products/Five/browser/tests/test_recurse.py
U Zope/trunk/src/Products/Five/configure.zcml
A Zope/trunk/src/Products/Five/publisher.zcml
U Zope/trunk/src/ZPublisher/BaseRequest.py
U Zope/trunk/src/ZPublisher/Publish.py
U Zope/trunk/src/ZPublisher/Test.py
U Zope/trunk/src/ZPublisher/tests/testBaseRequest.py
U Zope/trunk/src/ZPublisher/tests/testPublish.py
U Zope/trunk/src/Zope2/App/tests/testExceptionHook.py
U Zope/trunk/versions.cfg
-=-
Modified: Zope/trunk/alltests.cfg
===================================================================
--- Zope/trunk/alltests.cfg 2009-04-26 14:58:08 UTC (rev 99524)
+++ Zope/trunk/alltests.cfg 2009-04-26 14:59:14 UTC (rev 99525)
@@ -25,7 +25,6 @@
zope.container
zope.contentprovider
zope.contenttype
- zope.copypastemove
zope.datetime
zope.deferredimport
zope.deprecation
@@ -49,7 +48,6 @@
zope.publisher
zope.schema
zope.security
- zope.securitypolicy
zope.sendmail
zope.sequencesort
zope.session
Added: Zope/trunk/dependencies.cfg
===================================================================
--- Zope/trunk/dependencies.cfg (rev 0)
+++ Zope/trunk/dependencies.cfg 2009-04-26 14:59:14 UTC (rev 99525)
@@ -0,0 +1,14 @@
+[buildout]
+
+extends = alltests.cfg
+
+parts += dependencies
+
+[dependencies]
+recipe = z3c.recipe.depgraph
+eggs = ${alltests:eggs}
+variants = base tred
+exclude =
+ ClientForm
+ docutils
+ mechanize
Property changes on: Zope/trunk/dependencies.cfg
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: Zope/trunk/src/Products/Five/browser/configure.zcml
===================================================================
--- Zope/trunk/src/Products/Five/browser/configure.zcml 2009-04-26 14:58:08 UTC (rev 99524)
+++ Zope/trunk/src/Products/Five/browser/configure.zcml 2009-04-26 14:59:14 UTC (rev 99525)
@@ -2,10 +2,6 @@
xmlns:browser="http://namespaces.zope.org/browser">
<interface
- interface="zope.publisher.interfaces.browser.IBrowserSkinType"
- />
-
- <interface
interface="zope.app.publisher.interfaces.browser.IMenuItemType"
/>
Modified: Zope/trunk/src/Products/Five/browser/tests/test_recurse.py
===================================================================
--- Zope/trunk/src/Products/Five/browser/tests/test_recurse.py 2009-04-26 14:58:08 UTC (rev 99524)
+++ Zope/trunk/src/Products/Five/browser/tests/test_recurse.py 2009-04-26 14:59:14 UTC (rev 99525)
@@ -43,7 +43,7 @@
>>> from zope.component import provideAdapter
>>> from zope.publisher.interfaces.browser import IBrowserRequest
- >>> from zope.component.interfaces import IDefaultViewName
+ >>> from zope.publisher.interfaces import IDefaultViewName
>>> provideAdapter(u'view', (IRecurse, IBrowserRequest), IDefaultViewName)
Here comes the actual test:
Modified: Zope/trunk/src/Products/Five/configure.zcml
===================================================================
--- Zope/trunk/src/Products/Five/configure.zcml 2009-04-26 14:58:08 UTC (rev 99524)
+++ Zope/trunk/src/Products/Five/configure.zcml 2009-04-26 14:59:14 UTC (rev 99525)
@@ -6,6 +6,7 @@
<include file="i18n.zcml" />
<include file="event.zcml"/>
<include file="deprecated.zcml"/>
+ <include file="publisher.zcml"/>
<include file="traversing.zcml"/>
<include package=".component" />
<include package=".browser" />
Added: Zope/trunk/src/Products/Five/publisher.zcml
===================================================================
--- Zope/trunk/src/Products/Five/publisher.zcml (rev 0)
+++ Zope/trunk/src/Products/Five/publisher.zcml 2009-04-26 14:59:14 UTC (rev 99525)
@@ -0,0 +1,23 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+ <interface interface="zope.publisher.interfaces.browser.IBrowserSkinType" />
+
+ <interface
+ interface="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
+ type="zope.publisher.interfaces.browser.IBrowserSkinType"
+ />
+
+ <class class="ZPublisher.HTTPRequest.HTTPRequest">
+ <implements
+ interface="zope.annotation.interfaces.IAttributeAnnotatable"
+ />
+ </class>
+
+ <adapter
+ name="default"
+ factory="zope.publisher.browser.getDefaultSkin"
+ for="zope.publisher.interfaces.browser.IBrowserRequest"
+ provides="zope.publisher.interfaces.IDefaultSkin"
+ />
+
+</configure>
Property changes on: Zope/trunk/src/Products/Five/publisher.zcml
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: Zope/trunk/src/ZPublisher/BaseRequest.py
===================================================================
--- Zope/trunk/src/ZPublisher/BaseRequest.py 2009-04-26 14:58:08 UTC (rev 99524)
+++ Zope/trunk/src/ZPublisher/BaseRequest.py 2009-04-26 14:59:14 UTC (rev 99525)
@@ -16,21 +16,17 @@
"""
from urllib import quote as urllib_quote
import xmlrpc
-from zExceptions import Forbidden, Unauthorized, NotFound
+from zExceptions import Forbidden, NotFound
from Acquisition import aq_base
from Acquisition.interfaces import IAcquirer
-from zope.interface import implements, providedBy, Interface
+from zope.interface import implements, Interface
from zope.component import queryMultiAdapter
-from zope.component import getSiteManager
-from zope.component.interfaces import ComponentLookupError
from zope.event import notify
from zope.app.publication.interfaces import EndRequestEvent
from zope.app.publisher.browser import queryDefaultViewName
from zope.publisher.interfaces import IPublishTraverse
-from zope.component.interfaces import IDefaultViewName
from zope.publisher.interfaces.browser import IBrowserPublisher
-from zope.publisher.interfaces.browser import IBrowserRequest
from zope.traversing.interfaces import TraversalError
from zope.traversing.namespace import nsParse, namespaceLookup
@@ -42,6 +38,7 @@
try:
from ExtensionClass import Base
+ from ZPublisher.Converters import type_converters
class RequestContainer(Base):
__roles__=None
def __init__(self,**kw):
Modified: Zope/trunk/src/ZPublisher/Publish.py
===================================================================
--- Zope/trunk/src/ZPublisher/Publish.py 2009-04-26 14:58:08 UTC (rev 99524)
+++ Zope/trunk/src/ZPublisher/Publish.py 2009-04-26 14:59:14 UTC (rev 99525)
@@ -21,7 +21,8 @@
from maybe_lock import allocate_lock
from mapply import mapply
from zExceptions import Redirect
-from zope.publisher.browser import setDefaultSkin
+from zope.publisher.interfaces import ISkinnable
+from zope.publisher.skinnable import setDefaultSkin
from zope.security.management import newInteraction, endInteraction
class Retry(Exception):
@@ -164,8 +165,10 @@
# Only reachable if Retry is raised and request supports retry.
newrequest=request.retry()
request.close() # Free resources held by the request.
+
# Set the default layer/skin on the newly generated request
- setDefaultSkin(newrequest)
+ if ISkinnable.providedBy(newrequest):
+ setDefaultSkin(newrequest)
try:
return publish(newrequest, module_name, after_list, debug)
finally:
@@ -199,7 +202,8 @@
# 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)
+ if ISkinnable.providedBy(request):
+ setDefaultSkin(request)
response = publish(request, module_name, after_list, debug=debug)
except SystemExit, v:
Modified: Zope/trunk/src/ZPublisher/Test.py
===================================================================
--- Zope/trunk/src/ZPublisher/Test.py 2009-04-26 14:58:08 UTC (rev 99524)
+++ Zope/trunk/src/ZPublisher/Test.py 2009-04-26 14:59:14 UTC (rev 99525)
@@ -195,8 +195,10 @@
# 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.publisher.browser import setDefaultSkin
- setDefaultSkin(request)
+ from zope.publisher.interfaces import ISkinnable
+ from zope.publisher.skinnable import setDefaultSkin
+ if ISkinnable.providedBy(request):
+ setDefaultSkin(request)
for k, v in extra.items(): request[k]=v
response = publish(request, module_name, after_list, debug=debug)
Modified: Zope/trunk/src/ZPublisher/tests/testBaseRequest.py
===================================================================
--- Zope/trunk/src/ZPublisher/tests/testBaseRequest.py 2009-04-26 14:58:08 UTC (rev 99524)
+++ Zope/trunk/src/ZPublisher/tests/testBaseRequest.py 2009-04-26 14:59:14 UTC (rev 99525)
@@ -518,7 +518,7 @@
def _setDefaultViewName(self, name):
from zope.component import getGlobalSiteManager
- from zope.component.interfaces import IDefaultViewName
+ from zope.publisher.interfaces import IDefaultViewName
from zope.publisher.browser import IBrowserRequest
gsm = getGlobalSiteManager()
gsm.registerAdapter(name, (self._dummyInterface(), IBrowserRequest),
Modified: Zope/trunk/src/ZPublisher/tests/testPublish.py
===================================================================
--- Zope/trunk/src/ZPublisher/tests/testPublish.py 2009-04-26 14:58:08 UTC (rev 99524)
+++ Zope/trunk/src/ZPublisher/tests/testPublish.py 2009-04-26 14:59:14 UTC (rev 99525)
@@ -1,5 +1,7 @@
-from zope.publisher.browser import setDefaultSkin
+from zope.interface import implements
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+from zope.publisher.interfaces.browser import IBrowserRequest
+from zope.publisher.skinnable import setDefaultSkin
from ZPublisher import Retry
from ZODB.POSException import ConflictError
@@ -89,6 +91,8 @@
"""Mock Request to replace ZPublisher.HTTPRequest.HTTPRequest.
"""
+ implements(IBrowserRequest)
+
args = ()
def __init__(self):
Modified: Zope/trunk/src/Zope2/App/tests/testExceptionHook.py
===================================================================
--- Zope/trunk/src/Zope2/App/tests/testExceptionHook.py 2009-04-26 14:58:08 UTC (rev 99524)
+++ Zope/trunk/src/Zope2/App/tests/testExceptionHook.py 2009-04-26 14:59:14 UTC (rev 99525)
@@ -16,15 +16,16 @@
import unittest
import logging
+from zope.interface.common.interfaces import IException
+from zope.publisher.skinnable import setDefaultSkin
from zope.publisher.interfaces import INotFound
from zope.security.interfaces import IUnauthorized
from zope.security.interfaces import IForbidden
-from zope.interface.common.interfaces import IException
from zope.app.testing import ztapi
from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.publisher.browser import setDefaultSkin
+
class ExceptionHookTestCase(unittest.TestCase):
def _makeOne(self):
@@ -162,7 +163,6 @@
getConfiguration().conflict_error_log_level = old_value
def testConflictErrorCount(self):
- from ZPublisher import Retry
from ZODB.POSException import ConflictError
def f():
raise ConflictError
@@ -397,7 +397,6 @@
self.failUnless("Exception View: InternalError" in str(v), v)
def testRedirectNoExceptionView(self):
- from ZPublisher.HTTPResponse import HTTPResponse
from zExceptions import Redirect
ztapi.browserView(IException, u'index.html', CustomExceptionView)
def f():
Modified: Zope/trunk/versions.cfg
===================================================================
--- Zope/trunk/versions.cfg 2009-04-26 14:58:08 UTC (rev 99524)
+++ Zope/trunk/versions.cfg 2009-04-26 14:59:14 UTC (rev 99525)
@@ -24,62 +24,63 @@
zc.buildout = 1.2.1
zc.lockfile = 1.0.0
zc.recipe.egg = 1.2.2
-zc.recipe.testrunner = 1.1.0
+zc.recipe.testrunner = 1.2.0
zdaemon = 2.0.4
zodbcode = 3.4.0
-zope.annotation = 3.4.1
-zope.app.apidoc = 3.6.1
+zope.annotation = 3.4.2
+zope.app.apidoc = 3.6.2
zope.app.applicationcontrol = 3.4.3
-zope.app.appsetup = 3.9.0
-zope.app.authentication = 3.5.0a2
+zope.app.appsetup = 3.10.1
zope.app.basicskin = 3.4.0
zope.app.broken = 3.5.0
zope.app.cache = 3.5.0
zope.app.catalog = 3.8.0
-zope.app.component = 3.6.0
-zope.app.container = 3.7.1
+zope.app.component = 3.7.0
+zope.app.container = 3.7.2
zope.app.content = 3.4.0
zope.app.dav = 3.5.0
zope.app.debug = 3.4.1
zope.app.dependable = 3.4.0
zope.app.dtmlpage = 3.5.0
zope.app.error = 3.5.2
-zope.app.exception = 3.4.2
+zope.app.exception = 3.5.0
zope.app.file = 3.5.0
-zope.app.folder = 3.5.0
-zope.app.form = 3.7.1
-zope.app.generations = 3.4.2
-zope.app.http = 3.5.0
-zope.app.i18n = 3.5.0
+zope.app.folder = 3.5.1
+zope.app.form = 3.7.2
+zope.app.generations = 3.5.0
+zope.app.http = 3.5.2
+zope.app.i18n = 3.6.0
zope.app.interface = 3.4.0
zope.app.intid = 3.7.0
zope.app.locales = 3.5.1
+zope.app.localpermission = 3.7.0
zope.app.pagetemplate = 3.5.0
-zope.app.principalannotation = 3.5.0
-zope.app.publication = 3.5.1
-zope.app.publisher = 3.6.0
+zope.app.principalannotation = 3.6.1
+zope.app.publication = 3.5.3
+zope.app.publisher = 3.6.2
zope.app.renderer = 3.5.0
zope.app.schema = 3.5.0
-zope.app.security = 3.6.0
+zope.app.security = 3.7.0
zope.app.securitypolicy = 3.5.1
zope.app.server = 3.4.2
zope.app.session = 3.6.0
-zope.app.testing = 3.6.0
+zope.app.testing = 3.6.2
zope.app.traversing = 3.4.0
zope.app.undo = 3.5.0
-zope.app.wsgi = 3.4.1
+zope.app.wsgi = 3.5.2
zope.app.zapi = 3.4.0
-zope.app.zcmlfiles = 3.5.2
-zope.app.zopeappgenerations = 3.4.0
+zope.app.zcmlfiles = 3.5.3
+zope.app.zopeappgenerations = 3.5.0
zope.app.zptpage = 3.5.0
+zope.authentication = 3.7.0
zope.broken = 3.5.0
zope.browser = 0.5.0
-zope.cachedescriptors = 3.4.1
+zope.cachedescriptors = 3.5.0
zope.catalog = 3.8.0
-zope.component = 3.5.1
+zope.component = 3.6.0
zope.configuration = 3.6.0
-zope.container = 3.7.1
-zope.contentprovider = 3.4.0
+zope.container = 3.8.1
+zope.contentprovider = 3.5.0
zope.contenttype = 3.4.1
zope.copy = 3.5.0
zope.copypastemove = 3.5.1
@@ -91,26 +92,28 @@
zope.dottedname = 3.4.5
zope.dublincore = 3.4.2
zope.error = 3.6.0
-zope.event = 3.4.0
+zope.event = 3.4.1
zope.exceptions = 3.5.2
zope.filerepresentation = 3.5.0
zope.formlib = 3.5.2
zope.hookable = 3.4.1
-zope.i18n = 3.6.0
+zope.i18n = 3.7.0
zope.i18nmessageid = 3.4.3
zope.index = 3.5.1
-zope.interface = 3.5.0
+zope.interface = 3.5.1
zope.intid = 3.7.0
zope.keyreference = 3.6.1
-zope.lifecycleevent = 3.5.0
+zope.lifecycleevent = 3.5.1
zope.location = 3.5.3
zope.minmax = 1.1.0
-zope.pagetemplate = 3.4.1
+zope.password = 3.5.1
+zope.pagetemplate = 3.4.2
+zope.principalannotation = 3.6.0
zope.proxy = 3.5.0
-zope.publisher = 3.5.7
-zope.schema = 3.5.2
+zope.publisher = 3.6.4
+zope.schema = 3.5.4
zope.security = 3.6.3
-zope.securitypolicy = 3.5.0
+zope.securitypolicy = 3.6.0
zope.sendmail = 3.5.1
zope.sequencesort = 3.4.0
zope.server = 3.5.0
@@ -121,6 +124,6 @@
zope.tal = 3.5.1
zope.tales = 3.4.0
zope.testbrowser = 3.6.0a2
-zope.testing = 3.7.1
-zope.traversing = 3.5.2
+zope.testing = 3.7.3
+zope.traversing = 3.6.0
zope.viewlet = 3.5.0
More information about the Checkins
mailing list