- updated imports

src/OFS/interfaces.py

@@ -13,10 +13,10 @@
 """OFS interfaces.
 """
 
+from zope.component.interfaces import IPossibleSite
 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
 
@@ -567,7 +567,7 @@ class IObjectManager(IZopeObject, ICopyContainer, INavigation, IManageable,
         """
 
     def manage_exportObject(id='', download=None, toxml=None,
-                            RESPONSE=None,REQUEST=None):
+                            RESPONSE=None, REQUEST=None):
         """Exports an object to a file and returns that file."""
 
     def manage_importObject(file, REQUEST=None, set_owner=1):

src/Products/Five/component/__init__.py

@@ -14,11 +14,12 @@
 """Five local component look-up support
 """
 
-import zope.interface
 import zope.component
 import zope.event
+import zope.interface
 from zope.component.interfaces import IComponentLookup
-from zope.location.interfaces import ISite, IPossibleSite
+from zope.component.interfaces import IPossibleSite
+from zope.component.interfaces import ISite
 from zope.traversing.interfaces import BeforeTraverseEvent
 
 import ExtensionClass

src/Products/Five/component/component.txt

@@ -19,8 +19,8 @@ First, we register Five's adapter:
 Now we create a site object with a stub component registry:
 
   >>> from OFS.ObjectManager import ObjectManager
+  >>> from zope.component.interfaces import ISite
   >>> from zope.interface import alsoProvides
-  >>> from zope.location.interfaces import ISite
 
   >>> components = object()
   >>> site = ObjectManager()

src/Products/Five/component/configure.zcml

@@ -4,7 +4,7 @@
   <adapter factory=".siteManagerAdapter" />
 
   <subscriber
-      for="zope.location.interfaces.ISite
+      for="zope.component.interfaces.ISite
            zope.traversing.interfaces.IBeforeTraverseEvent"
       handler="zope.site.site.threadSiteSubscriber"
       />

src/Products/Five/component/interfaces.py

@@ -14,8 +14,10 @@
 """Component interfaces
 """
 
-from zope.location.interfaces import ISite
+from zope.component.interfaces import ISite
 from OFS.interfaces import IObjectManager
 
+
 class IObjectManagerSite(IObjectManager, ISite):
+
     """Object manager that is also a site."""

src/Products/Five/component/makesite.txt

@@ -48,7 +48,7 @@ We can turn it into a site by using the ``components.html`` view:
 
 Now we ensure that the folder has been turned into a site:
 
-    >>> from zope.location.interfaces import ISite
+    >>> from zope.component.interfaces import ISite
     >>> ISite.providedBy(app.folder)
     True