[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py - updated imports
Yvo Schubbe
cvs-admin at zope.org
Mon Apr 2 07:10:54 UTC 2012
Log message for revision 124873:
- updated imports
Changed:
U Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py
-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py 2012-04-02 06:34:41 UTC (rev 124872)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py 2012-04-02 07:10:50 UTC (rev 124873)
@@ -23,17 +23,23 @@
from OFS.SimpleItem import SimpleItem
from Products.Five.component import enableSite
from Products.Five.component.interfaces import IObjectManagerSite
-from zope.site.hooks import clearSite
-from zope.site.hooks import setHooks
-from zope.site.hooks import setSite
+from zope.component import getGlobalSiteManager
from zope.component import getMultiAdapter
-from zope.component import getGlobalSiteManager
from zope.component import getSiteManager
from zope.component import handle
from zope.component import queryAdapter
from zope.component import queryUtility
from zope.component import subscribers
from zope.component.globalregistry import base
+try:
+ from zope.component.hooks import clearSite
+ from zope.component.hooks import setHooks
+ from zope.component.hooks import setSite
+except ImportError:
+ # BBB: for Zope < 2.13 (zope.component < 3.8)
+ from zope.site.hooks import clearSite
+ from zope.site.hooks import setHooks
+ from zope.site.hooks import setSite
from zope.interface import implements
from zope.interface import Interface
More information about the checkins
mailing list