[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/components.py - updated imports

Yvo Schubbe cvs-admin at zope.org
Fri Jun 8 09:33:19 UTC 2012


Log message for revision 126686:
  - updated imports

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/components.py

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/components.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/components.py	2012-06-08 09:31:59 UTC (rev 126685)
+++ Products.GenericSetup/trunk/Products/GenericSetup/components.py	2012-06-08 09:33:15 UTC (rev 126686)
@@ -22,14 +22,18 @@
 from zope.component import queryMultiAdapter
 from zope.component.interfaces import ComponentLookupError
 from zope.component.interfaces import IComponentRegistry
-from zope.location.interfaces import IPossibleSite
+try:
+    from zope.component.interfaces import IPossibleSite
+except ImportError:
+    # BBB: for Zope < 2.13 (zope.component < 3.8)
+    from zope.location.interfaces import IPossibleSite
 
 from Products.GenericSetup.interfaces import IBody
 from Products.GenericSetup.interfaces import IComponentsHandlerBlacklist
 from Products.GenericSetup.interfaces import ISetupEnviron
-from Products.GenericSetup.utils import XMLAdapterBase
 from Products.GenericSetup.utils import _getDottedName
 from Products.GenericSetup.utils import _resolveDottedName
+from Products.GenericSetup.utils import XMLAdapterBase
 
 BLACKLIST_SELF = _getDottedName(IComponentsHandlerBlacklist)
 



More information about the checkins mailing list