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

[Yvo Schubbe]

Log message for revision 124864:
  - updated imports

Changed:
  UU  five.localsitemanager/trunk/src/five/localsitemanager/browser.py
  U   five.localsitemanager/trunk/src/five/localsitemanager/browser.txt
  U   five.localsitemanager/trunk/src/five/localsitemanager/localsitemanager.txt
  UU  five.localsitemanager/trunk/src/five/localsitemanager/registry.py

-=-
Modified: five.localsitemanager/trunk/src/five/localsitemanager/browser.py
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/browser.py	2012-04-02 05:27:41 UTC (rev 124863)
+++ five.localsitemanager/trunk/src/five/localsitemanager/browser.py	2012-04-02 05:44:09 UTC (rev 124864)
@@ -13,14 +13,19 @@
 """Management view for local site manager.
 """
 
-from zope.site.hooks import setSite
+from Products.Five.component.browser import ObjectManagerSiteView
 from zope.component.globalregistry import base
+try:
+    from zope.component.hooks import setSite
+except ImportError:
+    # BBB: for Zope < 2.13 (zope.component < 3.8)
+    from zope.site.hooks import setSite
+
 from five.localsitemanager import make_objectmanager_site
 
-from Products.Five.component.browser import ObjectManagerSiteView
 
+class ObjectManagerSiteView(ObjectManagerSiteView):
 
-class ObjectManagerSiteView(ObjectManagerSiteView):
     """Configure the site setup for an ObjectManager.
     """
 


Property changes on: five.localsitemanager/trunk/src/five/localsitemanager/browser.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: five.localsitemanager/trunk/src/five/localsitemanager/browser.txt
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/browser.txt	2012-04-02 05:27:41 UTC (rev 124863)
+++ five.localsitemanager/trunk/src/five/localsitemanager/browser.txt	2012-04-02 05:44:09 UTC (rev 124864)
@@ -15,7 +15,7 @@
     >>> import Products.Five
     >>> import five.localsitemanager
 
-    # BBB for Zope 2.12
+    # BBB: for Zope < 2.13
     >>> try:
     ...     from Zope2.App.zcml import load_config, load_string
     ... except ImportError:
@@ -27,7 +27,11 @@
 
 Enable local component lookup hooks:
 
-    >>> from zope.site.hooks import setHooks
+    # BBB: for Zope < 2.13 (zope.component < 3.8)
+    >>> try:
+    ...     from zope.component.hooks import setHooks
+    ... except ImportError:
+    ...     from zope.site.hooks import setHooks
     >>> setHooks()
 
 User Set Up
@@ -38,7 +42,7 @@
 
 Create the test browser we'll be using:
 
-    # BBB for Zope 2.12
+    # BBB: for Zope < 2.13
     >>> try:
     ...     from Testing.testbrowser import Browser
     ... except ImportError:

Modified: five.localsitemanager/trunk/src/five/localsitemanager/localsitemanager.txt
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/localsitemanager.txt	2012-04-02 05:27:41 UTC (rev 124863)
+++ five.localsitemanager/trunk/src/five/localsitemanager/localsitemanager.txt	2012-04-02 05:44:09 UTC (rev 124864)
@@ -9,10 +9,13 @@
 
 Of course we now need to transform that IPossibleSite into a real ISite.
 
-    >>> import zope.component
-    >>> from zope.site.hooks import setSite
-
-    >>> from zope.site.hooks import setHooks
+    # BBB: for Zope < 2.13 (zope.component < 3.8)
+    >>> try:
+    ...     from zope.component.hooks import setHooks
+    ...     from zope.component.hooks import setSite
+    ... except ImportError:
+    ...     from zope.site.hooks import setHooks
+    ...     from zope.site.hooks import setSite
     >>> setHooks()
 
     >>> from five.localsitemanager import make_objectmanager_site
@@ -52,6 +55,7 @@
 Make sure the utility lookup only works when the correct active site has been
 configured.
 
+    >>> import zope.component
     >>> setSite()
     >>> zope.component.queryUtility(ITestUtility, name=u'hello_world') is None
     True

Modified: five.localsitemanager/trunk/src/five/localsitemanager/registry.py
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/registry.py	2012-04-02 05:27:41 UTC (rev 124863)
+++ five.localsitemanager/trunk/src/five/localsitemanager/registry.py	2012-04-02 05:44:09 UTC (rev 124864)
@@ -15,18 +15,23 @@
 
 import Acquisition
 import persistent
+import zope.component.interfaces
+import zope.event
 from Acquisition.interfaces import IAcquirer
 from OFS.ObjectManager import ObjectManager
-from zope.location.interfaces import ISite
+try:
+    from zope.component.hooks import getSite
+except ImportError:
+    # BBB: for Zope < 2.13 (zope.component < 3.8)
+    from zope.site.hooks import getSite
 from zope.component.persistentregistry import PersistentComponents
-from zope.component.registry import UtilityRegistration, _getUtilityProvided
-from zope.interface.adapter import VerifyingAdapterLookup
+from zope.component.registry import _getUtilityProvided
+from zope.component.registry import UtilityRegistration
 from zope.interface.adapter import _lookup
 from zope.interface.adapter import _lookupAll
 from zope.interface.adapter import _subscriptions
-from zope.site.hooks import getSite
-import zope.event
-import zope.component.interfaces
+from zope.interface.adapter import VerifyingAdapterLookup
+from zope.location.interfaces import ISite
 from ZPublisher.BaseRequest import RequestContainer
 
 from five.localsitemanager.utils import get_parent
@@ -96,7 +101,6 @@
                 if extendors is None:
                     continue
 
-            tmp_result = []
             _subscriptions(byorder[order], required, extendors, u'',
                            result, 0, order)
             result = [ _wrap(r, registry) for r in result ]


Property changes on: five.localsitemanager/trunk/src/five/localsitemanager/registry.py
___________________________________________________________________
Deleted: svn:keywords
   - Id