[Zope3-checkins] CVS: Zope3/src/zope/app/event - objectevent.py:1.4 subs.py:1.11

[Albertas Agejevas]

Update of /cvs-repository/Zope3/src/zope/app/event
In directory cvs.zope.org:/tmp/cvs-serv11034/src/zope/app/event

Modified Files:
	objectevent.py subs.py 
Log Message:
Renamed getPgysicalPathString() to getPath().

Got rid of getPhysicalPath() (which used to return a tuple) by replacing it
by getPath().


=== Zope3/src/zope/app/event/objectevent.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/event/objectevent.py:1.3	Tue Feb 11 10:59:44 2003
+++ Zope3/src/zope/app/event/objectevent.py	Wed Mar 19 14:57:27 2003
@@ -24,7 +24,7 @@
 from zope.app.interfaces.event import IObjectCopiedEvent
 from zope.app.interfaces.event import IObjectAnnotationsModifiedEvent
 from zope.app.interfaces.event import IObjectContentModifiedEvent
-from zope.app.traversing import getPhysicalPath
+from zope.app.traversing import getPath
 
 _marker = object()
 
@@ -36,7 +36,7 @@
     def _getLocation(self):
         if self.__location is not _marker:
             return self.__location
-        return getPhysicalPath(self.object)
+        return getPath(self.object)
 
     location = property(_getLocation)
 


=== Zope3/src/zope/app/event/subs.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/event/subs.py:1.10	Tue Feb 18 10:19:22 2003
+++ Zope3/src/zope/app/event/subs.py	Wed Mar 19 14:57:27 2003
@@ -27,8 +27,8 @@
 from zope.proxy.context import ContextMethod
 from zope.proxy.introspection import removeAllProxies
 
-from zope.app.traversing import getPhysicalPathString
-from zope.app.traversing import locationAsUnicode, getPhysicalPath, traverse
+from zope.app.traversing import getPath
+from zope.app.traversing import locationAsUnicode, traverse
 from zope.app.interfaces.event import IEvent, ISubscriber, ISubscribable
 from zope.app.interfaces.event import ISubscribingAware
 
@@ -447,13 +447,13 @@
     def subscribedTo(self, subscribable, event_type, filter):
         # XXX insert super() call here
         # This raises an error for subscriptions to global event service.
-        subscribable_path = getPhysicalPathString(subscribable)
+        subscribable_path = getPath(subscribable)
         self._subscriptions += ((subscribable_path, event_type, filter),)
 
     def unsubscribedFrom(self, subscribable, event_type, filter):
         # XXX insert super() call here
         # This raises an error for subscriptions to global event service.
-        subscribable_path = getPhysicalPathString(subscribable)
+        subscribable_path = getPath(subscribable)
         sub = list(self._subscriptions)
         sub.remove((subscribable_path, event_type, filter))
         self._subscriptions = tuple(sub)
@@ -506,7 +506,7 @@
                     # XXX remove this next line when objecthub is refactored
                     path = locationAsUnicode(path)
                 except NotFoundError:
-                    path = getPhysicalPathString(wrappedobj)
+                    path = getPath(wrappedobj)
             cleanobj = removeAllProxies(wrappedobj)
     elif isinstance(clean_reference, StringTypes):
         reftype = unicode
@@ -528,7 +528,7 @@
         reftype = object
         wrappedobj = reference
         cleanobj = clean_reference
-        path = getPhysicalPathString(wrappedobj)
+        path = getPath(wrappedobj)
         hub = queryService(context, HubIds)
         if hub is not None:
             try: