[Checkins] SVN: zope.app.publication/trunk/ Moved BeforeTraverseEvent and IBeforeTraverseEvent to zope.traversing.
Hanno Schlichting
hannosch at hannosch.eu
Tue Dec 15 14:42:03 EST 2009
Log message for revision 106562:
Moved BeforeTraverseEvent and IBeforeTraverseEvent to zope.traversing.
Changed:
U zope.app.publication/trunk/CHANGES.txt
U zope.app.publication/trunk/setup.py
U zope.app.publication/trunk/src/zope/app/publication/configure.zcml
U zope.app.publication/trunk/src/zope/app/publication/interfaces.py
U zope.app.publication/trunk/src/zope/app/publication/site.txt
U zope.app.publication/trunk/src/zope/app/publication/tests/test_zopepublication.py
U zope.app.publication/trunk/src/zope/app/publication/zopepublication.py
-=-
Modified: zope.app.publication/trunk/CHANGES.txt
===================================================================
--- zope.app.publication/trunk/CHANGES.txt 2009-12-15 19:40:32 UTC (rev 106561)
+++ zope.app.publication/trunk/CHANGES.txt 2009-12-15 19:42:02 UTC (rev 106562)
@@ -5,6 +5,8 @@
3.10.0 (unreleased)
------------------
+- Moved BeforeTraverseEvent and IBeforeTraverseEvent to zope.traversing.
+
- Removed dependency on zope.i18n.
- Import hooks functionality from zope.component after it was moved there from
Modified: zope.app.publication/trunk/setup.py
===================================================================
--- zope.app.publication/trunk/setup.py 2009-12-15 19:40:32 UTC (rev 106561)
+++ zope.app.publication/trunk/setup.py 2009-12-15 19:42:02 UTC (rev 106562)
@@ -69,7 +69,7 @@
'zope.browser>=1.2',
'zope.location',
'zope.publisher>=3.8.0',
- 'zope.traversing>=3.7.0',
+ 'zope.traversing>=3.9.0',
'setuptools',
],
include_package_data = True,
Modified: zope.app.publication/trunk/src/zope/app/publication/configure.zcml
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/configure.zcml 2009-12-15 19:40:32 UTC (rev 106561)
+++ zope.app.publication/trunk/src/zope/app/publication/configure.zcml 2009-12-15 19:42:02 UTC (rev 106562)
@@ -14,7 +14,7 @@
<subscriber
zcml:condition="installed zope.site"
for="zope.component.interfaces.ISite
- zope.app.publication.interfaces.IBeforeTraverseEvent"
+ zope.traversing.interfaces.IBeforeTraverseEvent"
handler="zope.site.threadSiteSubscriber"
/>
Modified: zope.app.publication/trunk/src/zope/app/publication/interfaces.py
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/interfaces.py 2009-12-15 19:40:32 UTC (rev 106561)
+++ zope.app.publication/trunk/src/zope/app/publication/interfaces.py 2009-12-15 19:42:02 UTC (rev 106562)
@@ -20,6 +20,11 @@
from zope import interface
import zope.component.interfaces
+# BBB: Re-import symbols to their old location.
+from zope.traversing.interfaces import IBeforeTraverseEvent
+from zope.traversing.interfaces import BeforeTraverseEvent
+
+
class IPublicationRequestFactory(interface.Interface):
"""Publication request factory"""
@@ -29,21 +34,7 @@
A request is created and configured with a publication object.
"""
-class IBeforeTraverseEvent(zope.component.interfaces.IObjectEvent):
- """An event which gets sent on publication traverse"""
- request = interface.Attribute("The current request")
-
-class BeforeTraverseEvent(object):
- """An event which gets sent on publication traverse"""
-
- interface.implements(IBeforeTraverseEvent)
-
- def __init__(self, ob, request):
- self.object = ob
- self.request = request
-
-
class IEndRequestEvent(interface.Interface):
"""An event which gets sent when the publication is ended"""
Modified: zope.app.publication/trunk/src/zope/app/publication/site.txt
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/site.txt 2009-12-15 19:40:32 UTC (rev 106561)
+++ zope.app.publication/trunk/src/zope/app/publication/site.txt 2009-12-15 19:42:02 UTC (rev 106562)
@@ -21,7 +21,8 @@
>>> mysite = CustomFolder('mysite')
>>> mysite.setSiteManager(sm)
- >>> ev = interfaces.BeforeTraverseEvent(mysite, request)
+ >>> from zope.traversing.interfaces import BeforeTraverseEvent
+ >>> ev = BeforeTraverseEvent(mysite, request)
>>> site.threadSiteSubscriber(mysite, ev)
>>> hooks.getSite()
Modified: zope.app.publication/trunk/src/zope/app/publication/tests/test_zopepublication.py
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/tests/test_zopepublication.py 2009-12-15 19:40:32 UTC (rev 106561)
+++ zope.app.publication/trunk/src/zope/app/publication/tests/test_zopepublication.py 2009-12-15 19:42:02 UTC (rev 106562)
@@ -593,7 +593,7 @@
self.assertEqual(txn_info['location'], expected_path)
def testSiteEvents(self):
- from zope.app.publication.interfaces import IBeforeTraverseEvent
+ from zope.traversing.interfaces import IBeforeTraverseEvent
from zope.app.publication.interfaces import IEndRequestEvent
set = []
Modified: zope.app.publication/trunk/src/zope/app/publication/zopepublication.py
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/zopepublication.py 2009-12-15 19:40:32 UTC (rev 106561)
+++ zope.app.publication/trunk/src/zope/app/publication/zopepublication.py 2009-12-15 19:42:02 UTC (rev 106562)
@@ -33,6 +33,7 @@
from zope.security.management import newInteraction, endInteraction
from zope.security.checker import ProxyFactory
from zope.security.proxy import removeSecurityProxy
+from zope.traversing.interfaces import BeforeTraverseEvent
from zope.traversing.interfaces import IPhysicallyLocatable
from zope.traversing.interfaces import IEtcNamespace
from zope.traversing.interfaces import TraversalError
@@ -42,7 +43,6 @@
import zope.authentication.interfaces
from zope.browser.interfaces import ISystemErrorView
-from zope.app.publication.interfaces import BeforeTraverseEvent
from zope.app.publication.interfaces import EndRequestEvent
from zope.publisher.defaultview import queryDefaultViewName
from zope.authentication.interfaces import IUnauthenticatedPrincipal
More information about the checkins
mailing list