[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/ObjectHub - ObjectHub.py:1.7

[Gary Poster]

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

Modified Files:
	ObjectHub.py 
Log Message:
Moves ObjectEvent, GlobalEventService, and Logger from the Zope.Event package to the Zope.App.Event package.

Does *not* redesign/refactor LocalEventService to accept paths and hubids and reject non-wrapped objects.  Maybe later.

This checkin may require you to hose your Data.fs.

For quadruple checking, I'll send a note to zope3-dev when I've confirmed that a fresh checkout works.




=== Zope3/lib/python/Zope/App/OFS/Services/ObjectHub/ObjectHub.py 1.6 => 1.7 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ObjectHub/ObjectHub.py:1.6	Fri Dec  6 08:23:45 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ObjectHub/ObjectHub.py	Sat Dec 21 10:32:56 2002
@@ -30,9 +30,9 @@
 
 from Zope.Exceptions import NotFoundError
 
-from Zope.Event.IObjectEvent import IObjectRemovedEvent, IObjectEvent
-from Zope.Event.IObjectEvent import IObjectMovedEvent, IObjectCreatedEvent
-from Zope.Event.IObjectEvent import IObjectModifiedEvent
+from Zope.App.Event.IObjectEvent import IObjectRemovedEvent, IObjectEvent
+from Zope.App.Event.IObjectEvent import IObjectMovedEvent, IObjectCreatedEvent
+from Zope.App.Event.IObjectEvent import IObjectModifiedEvent
 
 from Persistence.BTrees.IOBTree import IOBTree
 from Persistence.BTrees.OIBTree import OIBTree
@@ -225,7 +225,9 @@
         '''See interface ILocalObjectHub'''
         clean_self = removeAllProxies(wrapped_self)
         if isWrapper(location):
-            location = getPhysicalPath(location)
+            location = getPhysicalPath(location) # XXX this branch is
+            # not exercised: needs unit test
+            canonical_location = locationAsTuple(location)
         elif isinstance(location, int):
             canonical_location = clean_self.getLocation(location)
         else: