[Checkins] SVN: five.localsitemanager/trunk/src/five/localsitemanager/ - updated imports

[Yvo Schubbe]

Log message for revision 126685:
  - updated imports

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

-=-
Modified: five.localsitemanager/trunk/src/five/localsitemanager/__init__.py
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/__init__.py	2012-06-08 09:28:39 UTC (rev 126684)
+++ five.localsitemanager/trunk/src/five/localsitemanager/__init__.py	2012-06-08 09:31:59 UTC (rev 126685)
@@ -14,15 +14,19 @@
 """
 
 from Acquisition import aq_base
+from Products.Five.component import enableSite
+from Products.Five.component.interfaces import IObjectManagerSite
 from zope.component.globalregistry import base
 from zope.component.interfaces import ComponentLookupError
-from zope.location.interfaces import ISite
+try:
+    from zope.component.interfaces import ISite
+except ImportError:
+    # BBB: for Zope < 2.13 (zope.component < 3.8)
+    from zope.location.interfaces import ISite
+
 from five.localsitemanager.registry import PersistentComponents
 from five.localsitemanager.utils import get_parent
-from Products.Five.component.interfaces import IObjectManagerSite
-from Products.Five.component import enableSite
 
-
 def make_site(obj, iface=ISite):
     """Give the specified object required qualities to identify it as a proper
     ISite.
@@ -69,7 +73,7 @@
     if next is None:
         next = base
     sm = site.getSiteManager()
-    sm.__bases__ = (next, )
+    sm.__bases__ = (next,)
 
 # Original version: zope.site.site.changeSiteConfigurationAfterMove
 def update_sitemanager_bases_handler(site, event):

Modified: five.localsitemanager/trunk/src/five/localsitemanager/registry.py
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/registry.py	2012-06-08 09:28:39 UTC (rev 126684)
+++ five.localsitemanager/trunk/src/five/localsitemanager/registry.py	2012-06-08 09:31:59 UTC (rev 126685)
@@ -21,8 +21,10 @@
 from OFS.ObjectManager import ObjectManager
 try:
     from zope.component.hooks import getSite
+    from zope.component.interfaces import ISite
 except ImportError:
     # BBB: for Zope < 2.13 (zope.component < 3.8)
+    from zope.location.interfaces import ISite
     from zope.site.hooks import getSite
 from zope.component.persistentregistry import PersistentComponents
 from zope.component.registry import _getUtilityProvided
@@ -31,13 +33,13 @@
 from zope.interface.adapter import _lookupAll
 from zope.interface.adapter import _subscriptions
 from zope.interface.adapter import VerifyingAdapterLookup
-from zope.location.interfaces import ISite
 from ZPublisher.BaseRequest import RequestContainer
 
 from five.localsitemanager.utils import get_parent
 
 _marker = object()
 
+
 class FiveVerifyingAdapterLookup(VerifyingAdapterLookup):
 
     # override some AdapterLookupBase methods for acquisition wrapping
@@ -95,7 +97,7 @@
                 continue
 
             if provided is None:
-                extendors = (provided, )
+                extendors = (provided,)
             else:
                 extendors = registry._v_lookup._extendors.get(provided)
                 if extendors is None:
@@ -209,6 +211,7 @@
 
 
 class PersistentComponents(PersistentComponents, ObjectManager):
+
     """An implementation of a component registry that can be persisted
     and looks like a standard ObjectManager.  It also ensures that all
     utilities have the the parent of this site manager (which should be
@@ -236,7 +239,7 @@
 
     def registeredUtilities(self):
         for reg in super(PersistentComponents, self).registeredUtilities():
-            reg.component=_wrap(reg.component, self)
+            reg.component = _wrap(reg.component, self)
             yield reg
 
     def registerUtility(self, component=None, provided=None, name=u'', info=u'',
@@ -318,7 +321,7 @@
             if old is not None:
                 if isinstance(old[0], ComponentPathWrapper):
                     unwrapped_component = Acquisition.aq_base(component)
-                    component = ComponentPathWrapper(unwrapped_component,'')
-            
+                    component = ComponentPathWrapper(unwrapped_component, '')
+
         return super(PersistentComponents, self).unregisterUtility(
             component=component, provided=provided, name=name)