[Zope3-checkins] CVS: Zope3/src/zope/app/container - contained.py:1.6

[Philipp von Weitershausen]

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

Modified Files:
	contained.py 
Log Message:


Folder, its interfaces, and its browser views have moved to
zope.app.folder. That includes IRootFolder and the rootFolder
factory.




=== Zope3/src/zope/app/container/contained.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/container/contained.py:1.5	Sat Feb 14 22:07:17 2004
+++ Zope3/src/zope/app/container/contained.py	Tue Feb 24 11:51:11 2004
@@ -15,6 +15,16 @@
 
 $Id$
 """
+from zope.proxy import ProxyBase, getProxiedObject
+from zope.exceptions import DuplicationError
+from zope.security.checker import selectChecker, CombinedChecker
+
+import zope.interface
+from zope.interface.declarations import ObjectSpecificationDescriptor
+from zope.interface.declarations import getObjectSpecification
+from zope.interface.declarations import ObjectSpecification
+from zope.interface import providedBy
+
 from zope.app import zapi
 from zope.app.event.objectevent import ObjectEvent, modified
 from zope.app.event import publish
@@ -27,16 +37,8 @@
 from zope.app.interfaces.container import IObjectMovedEvent
 from zope.app.interfaces.container import IObjectRemovedEvent
 from zope.app.interfaces.location import ILocation
-from zope.exceptions import DuplicationError
-from zope.proxy import ProxyBase, getProxiedObject
-import zope.interface
 from zope.app.container._zope_app_container_contained import ContainedProxyBase
 from zope.app.container._zope_app_container_contained import getProxiedObject
-from zope.security.checker import selectChecker, CombinedChecker
-from zope.interface.declarations import ObjectSpecificationDescriptor
-from zope.interface.declarations import getObjectSpecification
-from zope.interface.declarations import ObjectSpecification
-from zope.interface import providedBy
 
 class Contained(object):
     """Stupid mix-in that defines __parent__ and __name__ attributes
@@ -721,7 +723,7 @@
 # Parentgeddon fixup:
 
 from zope.app.event.function import Subscriber
-from zope.app.interfaces.content.folder import IRootFolder
+from zope.app.folder.interfaces import IRootFolder
 from zope.app.interfaces.container import IWriteContainer
 from zope.app.interfaces.services.service import IPossibleSite
 from zope.app.interfaces.container import IContainer