[Checkins] SVN: zope.app.publication/trunk/ Moved EndRequestEvent and IEndRequestEvent to zope.publisher.
Hanno Schlichting
hannosch at hannosch.eu
Tue Dec 15 14:50:21 EST 2009
Log message for revision 106567:
Moved EndRequestEvent and IEndRequestEvent to zope.publisher.
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:49:31 UTC (rev 106566)
+++ zope.app.publication/trunk/CHANGES.txt 2009-12-15 19:50:20 UTC (rev 106567)
@@ -5,6 +5,8 @@
3.10.0 (unreleased)
------------------
+- Moved EndRequestEvent and IEndRequestEvent to zope.publisher.
+
- Moved BeforeTraverseEvent and IBeforeTraverseEvent to zope.traversing.
- Removed dependency on zope.i18n.
Modified: zope.app.publication/trunk/setup.py
===================================================================
--- zope.app.publication/trunk/setup.py 2009-12-15 19:49:31 UTC (rev 106566)
+++ zope.app.publication/trunk/setup.py 2009-12-15 19:50:20 UTC (rev 106567)
@@ -68,7 +68,7 @@
'zope.error',
'zope.browser>=1.2',
'zope.location',
- 'zope.publisher>=3.8.0',
+ 'zope.publisher>=3.11.0',
'zope.traversing>=3.9.0',
'setuptools',
],
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:49:31 UTC (rev 106566)
+++ zope.app.publication/trunk/src/zope/app/publication/configure.zcml 2009-12-15 19:50:20 UTC (rev 106567)
@@ -20,7 +20,7 @@
<subscriber
zcml:condition="installed zope.site"
- for="zope.app.publication.interfaces.IEndRequestEvent"
+ for="zope.publisher.interfaces.IEndRequestEvent"
handler="zope.site.clearThreadSiteSubscriber"
/>
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:49:31 UTC (rev 106566)
+++ zope.app.publication/trunk/src/zope/app/publication/interfaces.py 2009-12-15 19:50:20 UTC (rev 106567)
@@ -18,9 +18,10 @@
__docformat__ = 'restructuredtext'
from zope import interface
-import zope.component.interfaces
# BBB: Re-import symbols to their old location.
+from zope.publisher.interfaces import IEndRequestEvent
+from zope.publisher.interfaces import EndRequestEvent
from zope.traversing.interfaces import IBeforeTraverseEvent
from zope.traversing.interfaces import BeforeTraverseEvent
@@ -34,20 +35,6 @@
A request is created and configured with a publication object.
"""
-
-class IEndRequestEvent(interface.Interface):
- """An event which gets sent when the publication is ended"""
-
-
-class EndRequestEvent(object):
- """An event which gets sent when the publication is ended"""
-
- interface.implements(IEndRequestEvent)
-
- def __init__(self, ob, request):
- self.object = ob
- self.request = request
-
class IRequestFactory(interface.Interface):
def __call__(input_stream, env):
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:49:31 UTC (rev 106566)
+++ zope.app.publication/trunk/src/zope/app/publication/site.txt 2009-12-15 19:50:20 UTC (rev 106567)
@@ -30,7 +30,8 @@
Once the request is completed,
- >>> ev = interfaces.EndRequestEvent(mysite, request)
+ >>> from zope.publisher.interfaces import EndRequestEvent
+ >>> ev = EndRequestEvent(mysite, request)
>>> site.clearThreadSiteSubscriber(ev)
the site assignment is cleared again:
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:49:31 UTC (rev 106566)
+++ zope.app.publication/trunk/src/zope/app/publication/tests/test_zopepublication.py 2009-12-15 19:50:20 UTC (rev 106567)
@@ -593,8 +593,8 @@
self.assertEqual(txn_info['location'], expected_path)
def testSiteEvents(self):
+ from zope.publisher.interfaces import IEndRequestEvent
from zope.traversing.interfaces import IBeforeTraverseEvent
- from zope.app.publication.interfaces import IEndRequestEvent
set = []
clear = []
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:49:31 UTC (rev 106566)
+++ zope.app.publication/trunk/src/zope/app/publication/zopepublication.py 2009-12-15 19:50:20 UTC (rev 106567)
@@ -43,8 +43,8 @@
import zope.authentication.interfaces
from zope.browser.interfaces import ISystemErrorView
-from zope.app.publication.interfaces import EndRequestEvent
from zope.publisher.defaultview import queryDefaultViewName
+from zope.publisher.interfaces import EndRequestEvent
from zope.authentication.interfaces import IUnauthenticatedPrincipal
from zope.authentication.interfaces import IFallbackUnauthenticatedPrincipal
from zope.authentication.interfaces import IAuthentication
More information about the checkins
mailing list