[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/LocalEventService - LocalEventService.py:1.1.2.4 LocalServiceSubscribable.py:1.1.2.2

[Gary Poster]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Services/LocalEventService
In directory cvs.zope.org:/tmp/cvs-serv18331/lib/python/Zope/App/OFS/Services/LocalEventService

Modified Files:
      Tag: Zope-3x-branch
	LocalEventService.py LocalServiceSubscribable.py 
Log Message:
More tests of the event service code--the majority of it is a translation of the global event service tests for the local event service, but there are a few new ones as well.  I plan for a few more to come.  A fix or two for errors that the tests found also included.



=== Zope3/lib/python/Zope/App/OFS/Services/LocalEventService/LocalEventService.py 1.1.2.3 => 1.1.2.4 ===
     __implements__ = ILocalEventService
     
-    __serviceName="Events" # used by LocalServiceSubscribable
+    _serviceName="Events" # used by LocalServiceSubscribable
+    
+    subscribeOnBind=1
     
     def __init__(self):
         LocalServiceSubscribable.__init__(self)
         LocalSubscriptionAware.__init__(self)
-        self.subscribeOnBind=1
     
     def isPromotableEvent(self, event):
         "see ILocalEventService"


=== Zope3/lib/python/Zope/App/OFS/Services/LocalEventService/LocalServiceSubscribable.py 1.1.2.1 => 1.1.2.2 ===
 from LocalSubscribable import LocalSubscribable
 from Persistence import Persistent
+from Zope.ComponentArchitecture import getNextService
 
 class LocalServiceSubscribable(LocalSubscribable, Persistent):
     """a local mix-in for services"""
     
-    __serviceName=None # replace me
+    _serviceName=None # replace me
     
     def unsubscribe(wrapped_self, subscriber, event_type=None, filter=None):
         subscriber=removeAllProxies(subscriber) # might be wrapped, might not
@@ -45,7 +46,7 @@
                 break
         else:
             # raise NotFoundError(subscriber)
-            getNextService(wrapped_self, clean_self.__serviceName).unsubscribe(
+            getNextService(wrapped_self, clean_self._serviceName).unsubscribe(
                 subscriber, event_type, filter)
             return
         
@@ -57,7 +58,7 @@
             if event_type is IEvent:
                 ev_type=None # handle optimization
             if ev_type not in ev_set:
-                getNextService(wrapped_self, clean_self.__serviceName).unsubscribe(
+                getNextService(wrapped_self, clean_self._serviceName).unsubscribe(
                     subscriber, event_type, filter)
             else:
                 subscriptions = clean_self._registry.getJustForType(ev_type)
@@ -87,7 +88,7 @@
                     else: # kept (added back)
                         subscriptions.append(sub)
             del clean_self._subscribers[subscriber_index]
-            getNextService(wrapped_self, clean_self.__serviceName).unsubscribe(
+            getNextService(wrapped_self, clean_self._serviceName).unsubscribe(
                 subscriber, event_type, filter)
         clean_self._registry=clean_self._registry #trigger persistence, if pertinent
     
@@ -97,9 +98,9 @@
         subscriber=removeAllProxies(subscriber) # might be wrapped, might not
         
         clean_self=removeAllProxies(wrapped_self)
-        result=Subscribable.listSubscriptions(clean_self, subscriber, event_type)
+        result=LocalSubscribable.listSubscriptions(clean_self, subscriber, event_type)
         result.extend(getNextService(
-            wrapped_self, clean_self.__serviceName).listSubscriptions(
+            wrapped_self, clean_self._serviceName).listSubscriptions(
                 subscriber, event_type))
         return result