[Zope3-checkins] CVS: Zope3/src/zope/app/folder - folder.py:1.4 fssync.py:1.6 interfaces.py:1.4 tests.py:1.6

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/folder
In directory cvs.zope.org:/tmp/cvs-serv16268/src/zope/app/folder

Modified Files:
	folder.py fssync.py interfaces.py tests.py 
Log Message:


Adjusted imports of placefulsetup and site-related objects.




=== Zope3/src/zope/app/folder/folder.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/folder/folder.py:1.3	Wed Feb 25 18:02:25 2004
+++ Zope3/src/zope/app/folder/folder.py	Sat Mar 13 10:21:17 2004
@@ -21,7 +21,7 @@
 from zope.interface import implements, directlyProvides
 
 from zope.app.container.contained import Contained, setitem, uncontained
-from zope.app.services.servicecontainer import ServiceManagerContainer
+from zope.app.site.servicecontainer import ServiceManagerContainer
 
 from interfaces import IFolder, IRootFolder
 


=== Zope3/src/zope/app/folder/fssync.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/folder/fssync.py:1.5	Sat Mar  6 10:38:43 2004
+++ Zope3/src/zope/app/folder/fssync.py	Sat Mar 13 10:21:17 2004
@@ -17,7 +17,7 @@
 """
 
 from zope.fssync.server.entryadapter import DirectoryAdapter
-from zope.app.interfaces.services.service import ISite
+from zope.app.site.interfaces import ISite
 
 __metaclass__ = type
 


=== Zope3/src/zope/app/folder/interfaces.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/folder/interfaces.py:1.3	Wed Mar  3 05:38:43 2004
+++ Zope3/src/zope/app/folder/interfaces.py	Sat Mar 13 10:21:18 2004
@@ -18,7 +18,7 @@
 from zope.app.container.interfaces import IAdding
 from zope.app.container.interfaces import IContainer, IContentContainer
 from zope.app.interfaces.traversing import IContainmentRoot
-from zope.app.interfaces.services.service import IPossibleSite
+from zope.app.site.interfaces import IPossibleSite
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 
 class IFolder(IContainer, IContentContainer, IPossibleSite,


=== Zope3/src/zope/app/folder/tests.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/folder/tests.py:1.5	Sat Mar  6 10:38:43 2004
+++ Zope3/src/zope/app/folder/tests.py	Sat Mar 13 10:21:18 2004
@@ -23,7 +23,7 @@
 from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.folder.interfaces import IFolder
 from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
-from zope.app.services.tests.placefulsetup import PlacefulSetup
+from zope.app.site.tests.placefulsetup import PlacefulSetup
 from zope.app.component.tests.test_servicemanagercontainer \
      import BaseTestServiceManagerContainer
 from zope.app.container.tests.test_icontainer import BaseTestIContainer