[Checkins] SVN: five.localsitemanager/trunk/src/five/localsitemanager/registry.py Undo last change which was not intended for trunk.

[Lawrence Rowe]

Log message for revision 127648:
  Undo last change which was not intended for trunk.

Changed:
  U   five.localsitemanager/trunk/src/five/localsitemanager/registry.py

-=-
Modified: five.localsitemanager/trunk/src/five/localsitemanager/registry.py
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/registry.py	2012-08-30 15:42:42 UTC (rev 127647)
+++ five.localsitemanager/trunk/src/five/localsitemanager/registry.py	2012-08-30 15:48:54 UTC (rev 127648)
@@ -18,7 +18,6 @@
 import zope.component.interfaces
 import zope.event
 from Acquisition.interfaces import IAcquirer
-from OFS.Application import Application
 from OFS.ObjectManager import ObjectManager
 try:
     from zope.component.hooks import getSite
@@ -30,12 +29,11 @@
 from zope.component.persistentregistry import PersistentComponents
 from zope.component.registry import _getUtilityProvided
 from zope.component.registry import UtilityRegistration
-from zope.interface import implements
 from zope.interface.adapter import _lookup
 from zope.interface.adapter import _lookupAll
 from zope.interface.adapter import _subscriptions
 from zope.interface.adapter import VerifyingAdapterLookup
-from zope.location.interfaces import IContained
+from ZPublisher.BaseRequest import RequestContainer
 
 from five.localsitemanager.utils import get_parent
 
@@ -194,7 +192,7 @@
     obj = Acquisition.aq_inner(obj)
     base = Acquisition.aq_base(obj)
     parent = Acquisition.aq_parent(obj)
-    if parent is None or isinstance(parent, Application):
+    if parent is None or isinstance(parent, RequestContainer):
         return base
     return base.__of__(_rewrap(parent))
 
@@ -220,8 +218,6 @@
     the ISite) as their acquired parent.
     """
 
-    implements(IContained)
-
     def _init_registries(self):
         super(PersistentComponents, self)._init_registries()
         utilities = Acquisition.aq_base(self.utilities)