[Checkins] SVN: zope.app.publication/trunk/ Update imports after zope.app.security refactorings

[Dan Korostelev]

Log message for revision 98115:
  Update imports after zope.app.security refactorings

Changed:
  U   zope.app.publication/trunk/CHANGES.txt
  U   zope.app.publication/trunk/setup.py
  U   zope.app.publication/trunk/src/zope/app/publication/tests/test_browserpublication.py
  U   zope.app.publication/trunk/src/zope/app/publication/tests/test_zopepublication.py
  U   zope.app.publication/trunk/src/zope/app/publication/zopepublication.py

-=-
Modified: zope.app.publication/trunk/CHANGES.txt
===================================================================
--- zope.app.publication/trunk/CHANGES.txt	2009-03-14 20:15:43 UTC (rev 98114)
+++ zope.app.publication/trunk/CHANGES.txt	2009-03-14 20:55:37 UTC (rev 98115)
@@ -5,7 +5,8 @@
 3.5.4 (unreleased)
 ------------------
 
-- ...
+- Update imports from zope.app.security to zope.authentication and
+  zope.principalregistry.
 
 3.5.3 (2009-03-13)
 ------------------

Modified: zope.app.publication/trunk/setup.py
===================================================================
--- zope.app.publication/trunk/setup.py	2009-03-14 20:15:43 UTC (rev 98114)
+++ zope.app.publication/trunk/setup.py	2009-03-14 20:55:37 UTC (rev 98115)
@@ -53,16 +53,17 @@
               'zope.app.zcmlfiles',
               'zope.app.dav',
               'zope.app.zptpage',
+              'zope.principalregistry',
               ]),
     install_requires=['zope.interface',
                       'ZODB3',
+                      'zope.authentication',
                       'zope.component',
                       'zope.error',
                       'zope.i18n',
                       'zope.app.http',
                       'zope.app.applicationcontrol',
                       'zope.app.exception',
-                      'zope.app.security',
                       'setuptools',
                       ],
     include_package_data = True,

Modified: zope.app.publication/trunk/src/zope/app/publication/tests/test_browserpublication.py
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/tests/test_browserpublication.py	2009-03-14 20:15:43 UTC (rev 98114)
+++ zope.app.publication/trunk/src/zope/app/publication/tests/test_browserpublication.py	2009-03-14 20:55:37 UTC (rev 98115)
@@ -13,7 +13,7 @@
 ##############################################################################
 """Browser Publication Tests
 
-$Id: test_browserpublication.py 38357 2005-09-07 20:14:34Z srichter $
+$Id$
 """
 import unittest
 
@@ -31,7 +31,7 @@
 from zope.security.proxy import Proxy, removeSecurityProxy
 from zope.security.checker import defineChecker, NamesChecker
 
-from zope.app.security.principalregistry import principalRegistry
+from zope.principalregistry.principalregistry import principalRegistry
 
 from zope.app.publication.browser import BrowserPublication
 from zope.app.publication.httpfactory import HTTPPublicationRequestFactory

Modified: zope.app.publication/trunk/src/zope/app/publication/tests/test_zopepublication.py
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/tests/test_zopepublication.py	2009-03-14 20:15:43 UTC (rev 98114)
+++ zope.app.publication/trunk/src/zope/app/publication/tests/test_zopepublication.py	2009-03-14 20:55:37 UTC (rev 98115)
@@ -43,13 +43,13 @@
 from zope.app.testing.placelesssetup import PlacelessSetup
 from zope.app.testing import setup, ztapi
 
-from zope.app.security.principalregistry import principalRegistry
-from zope.app.security.interfaces import IUnauthenticatedPrincipal, IPrincipal
+from zope.authentication.interfaces import IAuthentication
+from zope.authentication.interfaces import IFallbackUnauthenticatedPrincipal
+from zope.authentication.interfaces import IUnauthenticatedPrincipal
+from zope.security.interfaces import IPrincipal
+from zope.principalregistry.principalregistry import principalRegistry
 from zope.app.publication.zopepublication import ZopePublication
 from zope.app.folder import Folder, rootFolder
-from zope.app.security.interfaces import IAuthentication
-from zope.app.security.interfaces import IFallbackUnauthenticatedPrincipal
-from zope.app.security.principalregistry import principalRegistry
 
 
 class Principal(object):

Modified: zope.app.publication/trunk/src/zope/app/publication/zopepublication.py
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/zopepublication.py	2009-03-14 20:15:43 UTC (rev 98114)
+++ zope.app.publication/trunk/src/zope/app/publication/zopepublication.py	2009-03-14 20:55:37 UTC (rev 98115)
@@ -38,7 +38,7 @@
 from zope.location import LocationProxy
 from zope.error.interfaces import IErrorReportingUtility
 
-import zope.app.security.interfaces
+import zope.authentication.interfaces
 from zope.app.applicationcontrol.applicationcontrol \
      import applicationControllerRoot
 from zope.app.exception.interfaces import ISystemErrorView
@@ -46,9 +46,9 @@
 from zope.app.publication.interfaces import EndRequestEvent
 from zope.app.publication.publicationtraverse import PublicationTraverse
 from zope.app.publisher.browser import queryDefaultViewName
-from zope.app.security.interfaces import IUnauthenticatedPrincipal
-from zope.app.security.interfaces import IFallbackUnauthenticatedPrincipal
-from zope.app.security.interfaces import IAuthentication
+from zope.authentication.interfaces import IUnauthenticatedPrincipal
+from zope.authentication.interfaces import IFallbackUnauthenticatedPrincipal
+from zope.authentication.interfaces import IAuthentication
 from zope.location.interfaces import ISite
 
 class Cleanup(object):
@@ -81,7 +81,7 @@
     def beforeTraversal(self, request):
         # Try to authenticate against the root authentication utility.
         auth = zope.component.getGlobalSiteManager().getUtility(
-            zope.app.security.interfaces.IAuthentication)
+            zope.authentication.interfaces.IAuthentication)
         principal = auth.authenticate(request)
         if principal is None:
             principal = auth.unauthenticatedPrincipal()