[Zope3-checkins] CVS: Zope3/src/zope/app/publication/tests - test_zopepublication.py:1.20.10.1

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/src/zope/app/publication/tests
In directory cvs.zope.org:/tmp/cvs-serv18179/publication/tests

Modified Files:
      Tag: philikon-movecontent-branch
	test_zopepublication.py 
Log Message:
Folder has moved. Reorganize imports.


=== Zope3/src/zope/app/publication/tests/test_zopepublication.py 1.20 => 1.20.10.1 ===
--- Zope3/src/zope/app/publication/tests/test_zopepublication.py:1.20	Thu Nov 27 08:59:23 2003
+++ Zope3/src/zope/app/publication/tests/test_zopepublication.py	Sun Feb  8 09:38:37 2004
@@ -13,44 +13,34 @@
 ##############################################################################
 import unittest
 import sys
-
-from zope.app import zapi
-from zope.interface.verify import verifyClass
-from zope.interface import implements, classImplements, implementedBy
+from cStringIO import StringIO
 
 from zodb.db import DB
 from zodb.storage.mapping import MappingStorage
+from transaction import get_transaction
 
-from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.app.tests import ztapi
-
+from zope.interface.verify import verifyClass
+from zope.interface import implements, classImplements, implementedBy
 from zope.i18n.interfaces import IUserPreferredCharsets
-
+from zope.component.interfaces import IServiceService
 from zope.publisher.base import TestPublication
 from zope.publisher.http import IHTTPRequest, HTTPCharsets
-
+from zope.publisher.interfaces import IRequest
 from zope.security import simplepolicies
 from zope.security.management import setSecurityPolicy, getSecurityManager
 
+from zope.app import zapi
+from zope.app.tests.placelesssetup import PlacelessSetup
+from zope.app.tests import ztapi
+
+from zope.app.services.servicenames import Authentication
 from zope.app.security.registries.principalregistry import principalRegistry
 from zope.app.interfaces.security import IUnauthenticatedPrincipal
-
 from zope.app.publication.zopepublication import ZopePublication
-
-from zope.app.content.folder import Folder, rootFolder
-
-from zope.component.interfaces import IServiceService
-
+from zope.app.folder import Folder, rootFolder
 from zope.publisher.base import TestRequest
 from zope.publisher.browser import BrowserResponse
 
-from transaction import get_transaction
-from cStringIO import StringIO
-
-from zope.app.services.servicenames import Authentication
-
-from zope.publisher.interfaces import IRequest
-
 class BasePublicationTests(PlacelessSetup, unittest.TestCase):
 
     def setUp(self):
@@ -66,8 +56,7 @@
         app = getattr(root, ZopePublication.root_name, None)
 
         if app is None:
-            from zope.app.content.folder import rootFolder
-
+            from zope.app.folder import rootFolder
             app = rootFolder()
             root[ZopePublication.root_name] = app
 
@@ -298,7 +287,7 @@
         s.provideView(ISimpleReadContainer, '_traverse', IRequest,
                       ContainerTraverser)
 
-        from zope.app.interfaces.content.folder import IFolder
+        from zope.app.interfaces.folder import IFolder
         from zope.security.checker import defineChecker, InterfaceChecker
         defineChecker(Folder, InterfaceChecker(IFolder))