Provide forward compatibility for IPossibleSite interface

zopefoundation · Mar 2, 2013 · 4d74906 · 4d74906
1 parent 0584e95
commit 4d74906
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/OFS/interfaces.py b/src/OFS/interfaces.py
@@ -16,7 +16,6 @@
 from zope.container.interfaces import IContainer
 from zope.interface import Attribute
 from zope.interface import Interface
-from zope.location.interfaces import IPossibleSite
 from zope.location.interfaces import IRoot
 from zope.schema import Bool, BytesLine, Tuple
 
@@ -29,6 +28,12 @@
 from webdav.interfaces import IDAVCollection
 from webdav.interfaces import IDAVResource
 
+# BBB
+try:
+    from zope.component.interfaces import IPossibleSite
+except ImportError:
+    from zope.location.interfaces import IPossibleSite
+
 
 class IOrderedContainer(Interface):
 

diff --git a/src/Products/Five/component/__init__.py b/src/Products/Five/component/__init__.py
@@ -18,7 +18,6 @@
 import zope.component
 import zope.event
 from zope.component.interfaces import IComponentLookup
-from zope.location.interfaces import ISite, IPossibleSite
 from zope.traversing.interfaces import BeforeTraverseEvent
 
 import ExtensionClass
@@ -27,10 +26,20 @@
 from ZPublisher.BeforeTraverse import registerBeforeTraverse
 from ZPublisher.BeforeTraverse import unregisterBeforeTraverse
 
+# BBB
+try:
+    from zope.component.interfaces import IPossibleSite
+    from zope.component.interfaces import ISite
+except ImportError:
+    from zope.location.interfaces import IPossibleSite
+    from zope.location.interfaces import ISite
+
+
 # Hook up custom component architecture calls
 from zope.site.hooks import setHooks
 setHooks()
 
+
 def findSite(obj, iface=ISite):
     """Find a site by walking up the object hierarchy, supporting both
     the ``ILocation`` API and Zope 2 Acquisition."""