[Zope3-checkins]
SVN: Zope3/branches/jim-simplifyevents/src/zope/app/
M src/zope/app/observable/configure.zcml
Jim Fulton
jim at zope.com
Wed May 26 13:01:21 EDT 2004
Log message for revision 25014:
M src/zope/app/observable/configure.zcml
M src/zope/app/undo/configure.zcml
M src/zope/app/dublincore/configure.zcml
M src/zope/app/appsetup/configure.zcml
M src/zope/app/event/configure.zcml
M src/zope/app/container/configure.zcml
M src/zope/app/module/configure.zcml
M src/zope/app/wiki/configure.zcml
Changd event handler configurations to use subscription adapters.
M src/zope/app/undo/__init__.py
M src/zope/app/servicenames.py
M src/zope/app/dublincore/tests/test_creatorannotator.py
M src/zope/app/workflow/interfaces/__init__.py
M src/zope/app/workflow/stateful/tests/test_instance.py
M src/zope/app/workflow/stateful/tests/test_contentworkflow.py
M src/zope/app/presentation/presentation.py
M src/zope/app/broken/broken.py
M src/zope/app/appsetup/bootstrap.py
M src/zope/app/appsetup/appsetup.py
M src/zope/app/appsetup/tests.py
M src/zope/app/rotterdam/tests/test_xmlnavigationviews.py
M src/zope/app/tests/setup.py
M src/zope/app/event/tests/placelesssetup.py
M src/zope/app/mail/interfaces.py
M src/zope/app/module/__init__.py
M src/zope/app/publication/interfaces.py
Removed uses of IEvent and removd references to event services.
-=-
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/appsetup/appsetup.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/appsetup/appsetup.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/appsetup/appsetup.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -18,9 +18,8 @@
import zope.interface
from zope.security.interfaces import IParticipation
from zope.security.management import system_user
-from zope.app.event.interfaces import IEvent
-class IDatabaseOpenedEvent(IEvent):
+class IDatabaseOpenedEvent(zope.interface.Interface):
"""The main database has been opened."""
database = zope.interface.Attribute("The main database.")
@@ -31,7 +30,7 @@
def __init__(self, database):
self.database = database
-class IProcessStartingEvent(IEvent):
+class IProcessStartingEvent(zope.interface.Interface):
"""The application server process is starting."""
class ProcessStarting:
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/appsetup/bootstrap.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/appsetup/bootstrap.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/appsetup/bootstrap.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -33,9 +33,7 @@
from zope.app.servicenames import EventPublication, EventSubscription
from zope.app.servicenames import ErrorLogging, Utilities
from zope.app.site.service import ServiceManager, ServiceRegistration
-from zope.app.event.localservice import EventService
from zope.app.errorservice import RootErrorReportingService
-from zope.app.event import function
from zope.app.container.interfaces import INameChooser
from zope.app.utility import UtilityRegistration, LocalUtilityService
@@ -161,14 +159,6 @@
XXX This ought to be configurable. For now, hardcode some
services we know we all need.
"""
- # The EventService class implements two services
- name = self.ensureService(EventPublication, EventService)
- if name:
- configureService(self.root_folder, EventSubscription, name)
- elif not self.service_manager.queryLocalService(EventSubscription):
- pub = self.service_manager.queryLocalService(EventPublication)
- name = zapi.getName(pub)
- configureService(self.root_folder, EventSubscription, name)
# Sundry other services
self.ensureService(ErrorLogging,
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/appsetup/configure.zcml
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/appsetup/configure.zcml 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/appsetup/configure.zcml 2004-05-26 17:01:20 UTC (rev 25014)
@@ -1,11 +1,8 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:event="http://namespaces.zope.org/event"
- >
+<configure xmlns="http://namespaces.zope.org/zope">
- <event:subscribe
- subscriber=".bootstrap.bootstrapInstance"
- event_types="zope.app.appsetup.IDatabaseOpenedEvent"
+ <subscribe
+ factory=".bootstrap.bootstrapInstance"
+ for="zope.app.appsetup.IDatabaseOpenedEvent"
/>
</configure>
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/appsetup/tests.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/appsetup/tests.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/appsetup/tests.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -24,7 +24,6 @@
from zope.app.folder.interfaces import IRootFolder
from zope.app.errorservice.interfaces import IErrorReportingService
from zope.app.principalannotation.interfaces import IPrincipalAnnotationService
-from zope.app.event.interfaces import IEventService
from zope.app.publication.zopepublication import ZopePublication
from zope.app.site.tests.placefulsetup import PlacefulSetup
from zope.app.errorservice import ErrorReportingService
@@ -126,9 +125,6 @@
package_name = '/++etc++site/default'
package = traverse(root_folder, package_name)
- self.assert_(IEventService.providedBy(
- traverse(package, 'EventPublication')))
-
self.assert_(IErrorReportingService.providedBy(
traverse(package, 'ErrorLogging')))
@@ -156,18 +152,12 @@
package_name = '/++etc++site/default'
package = traverse(root_folder, package_name)
- self.assert_(IEventService.providedBy(
- traverse(package, 'EventPublication')))
-
self.assertRaises(NotFoundError, traverse, root_folder,
'/++etc++site/default/ErrorLogging')
self.assert_(IErrorReportingService.providedBy(
traverse(package, 'Errors')))
- self.assert_(IEventService.providedBy(
- traverse(package, 'EventPublication')))
-
self.assert_(IPrincipalAnnotationService.providedBy(
traverse(package, 'PrincipalAnnotation')))
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/broken/broken.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/broken/broken.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/broken/broken.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -20,7 +20,6 @@
import ZODB.broken
import zope.interface
import zope.app.location.interfaces
-import zope.app.event.function
import zope.security.checker
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/container/configure.zcml
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/container/configure.zcml 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/container/configure.zcml 2004-05-26 17:01:20 UTC (rev 25014)
@@ -2,7 +2,6 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"
- xmlns:event="http://namespaces.zope.org/event"
i18n_domain="zope"
>
@@ -44,9 +43,9 @@
factory=".contained.NameChooser"
/>
- <event:subscribe
- subscriber=".dependency.CheckDependency"
- event_types="zope.app.container.interfaces.IObjectRemovedEvent"
+ <subscriber
+ factory=".dependency.CheckDependency"
+ for="zope.app.container.interfaces.IObjectRemovedEvent"
/>
<content class=".constraints.ItemTypePrecondition">
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/dublincore/configure.zcml
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/dublincore/configure.zcml 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/dublincore/configure.zcml 2004-05-26 17:01:20 UTC (rev 25014)
@@ -1,6 +1,4 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:event="http://namespaces.zope.org/event">
+<configure xmlns="http://namespaces.zope.org/zope">
<permission
id="zope.app.dublincore.view"
@@ -42,23 +40,27 @@
/>
</content>
- <event:subscribe
- subscriber=".timeannotators.ModifiedAnnotator"
- event_types="zope.app.event.interfaces.IObjectModifiedEvent"
+ <subscriber
+ factory=".timeannotators.ModifiedAnnotator"
+ for="zope.app.event.interfaces.IObjectModifiedEvent"
/>
- <event:subscribe
- subscriber=".timeannotators.CreatedAnnotator"
- event_types="zope.app.event.interfaces.IObjectCreatedEvent"
+ <subscriber
+ factory=".timeannotators.CreatedAnnotator"
+ for="zope.app.event.interfaces.IObjectCreatedEvent"
/>
- <event:subscribe
- subscriber=".creatorannotator.CreatorAnnotator"
- event_types="zope.app.event.interfaces.IObjectModifiedEvent
- zope.app.event.interfaces.IObjectCreatedEvent"
- />
+ <subscribe
+ factory=".creatorannotator.CreatorAnnotator"
+ for="zope.app.event.interfaces.IObjectModifiedEvent"
+ />
+ <subscribe
+ factory=".creatorannotator.CreatorAnnotator"
+ for="zope.app.event.interfaces.IObjectCreatedEvent"
+ />
+
<!-- Include browser package -->
<include package=".browser" />
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/dublincore/tests/test_creatorannotator.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/dublincore/tests/test_creatorannotator.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/dublincore/tests/test_creatorannotator.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -25,14 +25,13 @@
from zope.app.dublincore.creatorannotator import CreatorAnnotator
from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.security.interfaces import IPrincipal
-from zope.app.event.interfaces import IEvent
from zope.security.management import newInteraction, endInteraction
class IDummyContent(Interface):
pass
class DummyEvent:
- implements(IEvent)
+ pass
class DummyDCAdapter(object):
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/event/configure.zcml
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/event/configure.zcml 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/event/configure.zcml 2004-05-26 17:01:20 UTC (rev 25014)
@@ -3,38 +3,9 @@
xmlns:event="http://namespaces.zope.org/event"
>
-<serviceType
- id="EventPublication"
- interface="zope.app.event.interfaces.IPublisher" />
-
-<service
- serviceType="EventPublication"
- component="zope.app.event.globalservice.eventPublisher" />
-
<subscriber
for="zope.app.event.interfaces.IObjectEvent"
factory=".objectevent.objectEventNotify"
/>
-<!-- Local Event Service -->
-<content class=".localservice.EventService">
- <factory
- id="Events"
- />
- <require
- permission="zope.View"
- attributes="publish notify"
- />
- <require
- permission="zope.ManageServices"
- attributes="bound unbound subscribe unsubscribe subscribeOnBind
- unsubscribedFrom subscribedTo"
- />
-</content>
-
-<serviceType
- id="Subscription"
- interface=".interfaces.ISubscriptionService"
- />
-
</configure>
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/event/tests/placelesssetup.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/event/tests/placelesssetup.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/event/tests/placelesssetup.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -23,9 +23,6 @@
events = []
-def record(event):
- events.append(event)
-
def getEvents(event_type=None, filter=None):
r = []
for event in events:
@@ -44,7 +41,7 @@
def setUp(self):
clearEvents()
- ztapi.subscribe([None], None, record)
+ ztapi.handle([None], events.append)
import zope.testing.cleanup
zope.testing.cleanup.addCleanUp(clearEvents)
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/mail/interfaces.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/mail/interfaces.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/mail/interfaces.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -58,7 +58,6 @@
from zope.interface import Interface, Attribute
from zope.schema import Object, TextLine, Int, Password, BytesLine
-from zope.app.event.interfaces import IEvent
from zope.app.i18n import ZopeMessageIDFactory as _
@@ -176,7 +175,7 @@
default="/usr/lib/sendmail -oem -oi -f %(from)s %(to)s")
-class IMailEvent(IEvent):
+class IMailEvent(Interface):
"""Generic mail event."""
messageId = Attribute("Message id according to RFC 2822")
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/module/__init__.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/module/__init__.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/module/__init__.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -20,7 +20,6 @@
from zope.interface import implements
from zope.security.proxy import trustedRemoveSecurityProxy
-from zope.app.event import function
from zope.app.annotation.interfaces import IAttributeAnnotatable
from zope.app.filerepresentation.interfaces import IFileFactory
from zope.app.module.interfaces import IModuleManager
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/module/configure.zcml
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/module/configure.zcml 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/module/configure.zcml 2004-05-26 17:01:20 UTC (rev 25014)
@@ -1,7 +1,4 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:event="http://namespaces.zope.org/event"
- >
+<configure xmlns="http://namespaces.zope.org/zope">
<content class=".Manager">
<require
@@ -20,9 +17,9 @@
/>
<!-- Enable import of persistent modules -->
- <event:subscribe
- subscriber=".installPersistentModuleImporter"
- event_types="zope.app.appsetup.IProcessStartingEvent"
+ <subscriber
+ factory=".installPersistentModuleImporter"
+ for="zope.app.appsetup.IProcessStartingEvent"
/>
<include package=".browser" />
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/observable/configure.zcml
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/observable/configure.zcml 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/observable/configure.zcml 2004-05-26 17:01:20 UTC (rev 25014)
@@ -1,10 +1,8 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:event="http://namespaces.zope.org/event"
- >
+<configure xmlns="http://namespaces.zope.org/zope">
-<event:subscribe
- subscriber=".observerevent.observerEventNotifier"
- event_types="zope.app.event.interfaces.IObjectEvent" />
+<subscriber
+ factory=".observerevent.observerEventNotifier"
+ for="zope.app.event.interfaces.IObjectEvent"
+ />
</configure>
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/presentation/presentation.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/presentation/presentation.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/presentation/presentation.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -23,7 +23,6 @@
from zope.component.presentation import PresentationRegistration
import zope.app.container.contained
-import zope.app.event.interfaces
import zope.app.registration.interfaces
import zope.app.site.interfaces
import zope.app.adapter
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/publication/interfaces.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/publication/interfaces.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/publication/interfaces.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -17,9 +17,7 @@
"""
from zope.interface import implements, Interface
-from zope.app.event.interfaces import IEvent
-
class IPublicationRequestFactoryFactory(Interface):
"""Publication request factory factory"""
@@ -47,7 +45,7 @@
"""
-class IBeforeTraverseEvent(IEvent):
+class IBeforeTraverseEvent(Interface):
"""An event which gets sent on publication traverse"""
@@ -59,7 +57,7 @@
self.request = request
-class IEndRequestEvent(IEvent):
+class IEndRequestEvent(Interface):
"""An event which gets sent when the publication is ended"""
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/rotterdam/tests/test_xmlnavigationviews.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/rotterdam/tests/test_xmlnavigationviews.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/rotterdam/tests/test_xmlnavigationviews.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -23,20 +23,22 @@
from zope.app.tests import ztapi
from zope.app.traversing.api import traverse
-from zope.app.event.tests.eventsetup import EventSetup
from zope.app.container.interfaces import IReadContainer
from zope.app.rotterdam.tests import util
from zope.app.rotterdam.xmlobject import ReadContainerXmlObjectView
from zope.app.rotterdam.xmlobject import XmlObjectView
+from zope.app.site.tests.placefulsetup import PlacefulSetup
+
class File:
pass
-class TestXmlObject(EventSetup, TestCase):
+class TestXmlObject(PlacefulSetup, TestCase):
def setUp(self):
- super(TestXmlObject, self).setUp()
+ PlacefulSetup.setUp(self, site=True)
+ self.createStandardServices()
def testXMLTreeViews(self):
rcxov = ReadContainerXmlObjectView
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/servicenames.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/servicenames.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/servicenames.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -1,3 +1,4 @@
+
##############################################################################
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
@@ -22,7 +23,5 @@
Authentication = 'Authentication'
BrowserMenu = 'BrowserMenu'
-EventPublication = 'EventPublication'
-EventSubscription = 'Subscription'
ErrorLogging = 'ErrorLogging'
PrincipalAnnotation = 'PrincipalAnnotation'
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/tests/setup.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/tests/setup.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/tests/setup.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -182,28 +182,11 @@
zapi.traverse(default.getRegistrationManager(), key).status = ActiveStatus
return zapi.traverse(servicemanager, path)
-from zope.app.event.interfaces import ISubscriptionService
-from zope.app.event.localservice import EventService
-from zope.app.utility import LocalUtilityService
-from zope.app.servicenames import Utilities
-from zope.app.servicenames import EventPublication, EventSubscription
def createStandardServices(folder):
'''Create a bunch of standard placeful services
- Well, uh, 3
+ Well, uh, 0
'''
sm = createServiceManager(folder)
- defineService = zapi.getGlobalServices().defineService
- defineService(EventSubscription, ISubscriptionService)
- # EventPublication service already defined by
- # zope.app.events.tests.PlacelessSetup
-
- # EventService must be IAttributeAnnotatable so that it can support
- # dependencies.
- classImplements(EventService, IAttributeAnnotatable)
- events = EventService()
- addService(sm, EventPublication, events)
- addService(sm, EventSubscription, events, suffix='sub')
-
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/undo/__init__.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/undo/__init__.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/undo/__init__.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -19,7 +19,6 @@
from zope.exceptions import NotFoundError
from zope.app import zapi
-from zope.app.event import function
from zope.app.undo.interfaces import IUndoManager, UndoError
from zope.app.servicenames import Utilities
from zope.app.traversing.interfaces import IPhysicallyLocatable
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/undo/configure.zcml
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/undo/configure.zcml 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/undo/configure.zcml 2004-05-26 17:01:20 UTC (rev 25014)
@@ -1,7 +1,6 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
- xmlns:event="http://namespaces.zope.org/event"
i18n_domain="zope"
>
@@ -20,9 +19,9 @@
/>
- <event:subscribe
- subscriber=".undoSetup"
- event_types="zope.app.appsetup.IDatabaseOpenedEvent"
+ <subscriber
+ factory=".undoSetup"
+ for="zope.app.appsetup.IDatabaseOpenedEvent"
/>
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/wiki/configure.zcml
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/wiki/configure.zcml 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/wiki/configure.zcml 2004-05-26 17:01:20 UTC (rev 25014)
@@ -1,6 +1,5 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- xmlns:event="http://namespaces.zope.org/event"
xmlns:mail="http://namespaces.zope.org/mail"
i18n_domain="zope"
>
@@ -206,13 +205,14 @@
mailer="wiki-smtp" />
<!-- Register event listener for change mails -->
- <event:subscribe
- subscriber=".wikipage.mailer"
- event_types="zope.app.container.interfaces.IObjectAddedEvent
- zope.app.event.interfaces.IObjectModifiedEvent
- zope.app.container.interfaces.IObjectRemovedEvent
- zope.app.container.interfaces.IObjectMovedEvent"
+ <subscriber
+ factory=".wikipage.mailer"
+ for="zope.app.container.interfaces.IObjectAddedEvent"
/>
+ <subscriber
+ factory=".wikipage.mailer"
+ for="zope.app.event.interfaces.IMovedEvent"
+ />
<!-- Register various browser related components, including all views -->
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/workflow/interfaces/__init__.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/workflow/interfaces/__init__.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/workflow/interfaces/__init__.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -18,10 +18,9 @@
from zope.interface import Interface, Attribute
from zope.app.i18n import ZopeMessageIDFactory as _
from zope.app.container.interfaces import IContainer
-from zope.app.event.interfaces import IEvent
-class IWorkflowEvent(IEvent):
+class IWorkflowEvent(Interface):
"""This event describes a generic event that is triggered by the workflow
mechanism."""
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/workflow/stateful/tests/test_contentworkflow.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/workflow/stateful/tests/test_contentworkflow.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/workflow/stateful/tests/test_contentworkflow.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -24,8 +24,6 @@
from zope.app.annotation.interfaces import IAttributeAnnotatable
from zope.app.container.contained import Contained
from zope.app.event.objectevent import ObjectCreatedEvent
-from zope.app.event.tests.placelesssetup import eventPublisher, EventRecorder
-from zope.app.event.tests.placelesssetup import clearEvents
from zope.app.annotation.interfaces import IAnnotatable, IAttributeAnnotatable
from zope.app.event.interfaces import IObjectCreatedEvent
from zope.app.utility import UtilityRegistration
Modified: Zope3/branches/jim-simplifyevents/src/zope/app/workflow/stateful/tests/test_instance.py
===================================================================
--- Zope3/branches/jim-simplifyevents/src/zope/app/workflow/stateful/tests/test_instance.py 2004-05-26 16:33:26 UTC (rev 25013)
+++ Zope3/branches/jim-simplifyevents/src/zope/app/workflow/stateful/tests/test_instance.py 2004-05-26 17:01:20 UTC (rev 25014)
@@ -22,7 +22,6 @@
from zope.schema import Text, Int
from zope.component.service import serviceManager
-from zope.app.event.tests.placelesssetup import eventPublisher, EventRecorder
from zope.app.event.tests.placelesssetup import events, clearEvents
from zope.app.security.interfaces import IPermission
from zope.app.security.permission import Permission
@@ -114,7 +113,6 @@
self.pi = createProcessInstance(self.sm, 'definition1')
# Let's also listen to the fired events
clearEvents()
- eventPublisher.globalSubscribe(EventRecorder)
def testInterface(self):
More information about the Zope3-Checkins
mailing list