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

[Dan Korostelev]

Log message for revision 97952:
  Update imports.
  
  The addCheckerPublic was moved to zope.security.testing.
  

Changed:
  U   zope.app.security/trunk/CHANGES.txt
  U   zope.app.security/trunk/src/zope/app/security/browser/auth.py
  U   zope.app.security/trunk/src/zope/app/security/browser/configure.zcml
  U   zope.app.security/trunk/src/zope/app/security/browser/loginlogout.txt
  U   zope.app.security/trunk/src/zope/app/security/browser/tests.py
  U   zope.app.security/trunk/src/zope/app/security/tests/__init__.py

-=-
Modified: zope.app.security/trunk/CHANGES.txt
===================================================================
--- zope.app.security/trunk/CHANGES.txt	2009-03-12 03:23:29 UTC (rev 97951)
+++ zope.app.security/trunk/CHANGES.txt	2009-03-12 03:23:55 UTC (rev 97952)
@@ -29,6 +29,9 @@
   zope.security now knows about i18n messages and __name__ and __parent__
   attributes and won't protect them by default.
 
+- The addCheckerPublic was moved from zope.app.testing.tests to
+  zope.security.testing. Backward-compatibility import is provided.
+
 - The ``LocalPermission`` class is now moved to new ``zope.localpermission``
   package. This package now only has backward-compatibility imports and browser
   views and menu items for ZMI.

Modified: zope.app.security/trunk/src/zope/app/security/browser/auth.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/browser/auth.py	2009-03-12 03:23:29 UTC (rev 97951)
+++ zope.app.security/trunk/src/zope/app/security/browser/auth.py	2009-03-12 03:23:55 UTC (rev 97952)
@@ -16,15 +16,17 @@
 $Id$
 """
 import urllib
-from zope.interface import implements
-from zope.i18n import translate
+
 from zope import component
+from zope.app.pagetemplate import ViewPageTemplateFile
 from zope.app.publisher.interfaces.http import ILogin
+from zope.authentication.interfaces import IAuthentication
+from zope.authentication.interfaces import IUnauthenticatedPrincipal
+from zope.authentication.interfaces import ILogout, ILogoutSupported
+from zope.i18n import translate
+from zope.interface import implements
+
 from zope.app.security.i18n import _
-from zope.app.security.interfaces import IAuthentication
-from zope.app.security.interfaces import IUnauthenticatedPrincipal
-from zope.app.security.interfaces import ILogout, ILogoutSupported
-from zope.app.pagetemplate import ViewPageTemplateFile
 
 
 class AuthUtilitySearchView(object):

Modified: zope.app.security/trunk/src/zope/app/security/browser/configure.zcml
===================================================================
--- zope.app.security/trunk/src/zope/app/security/browser/configure.zcml	2009-03-12 03:23:29 UTC (rev 97951)
+++ zope.app.security/trunk/src/zope/app/security/browser/configure.zcml	2009-03-12 03:23:55 UTC (rev 97952)
@@ -4,7 +4,7 @@
 
 
   <adapter
-      for="zope.app.security.interfaces.IAuthentication
+      for="zope.authentication.interfaces.IAuthentication
            zope.publisher.interfaces.browser.IBrowserRequest"
       provides="zope.app.form.browser.interfaces.ISourceQueryView"
       factory="zope.app.security.browser.auth.AuthUtilitySearchView"

Modified: zope.app.security/trunk/src/zope/app/security/browser/loginlogout.txt
===================================================================
--- zope.app.security/trunk/src/zope/app/security/browser/loginlogout.txt	2009-03-12 03:23:29 UTC (rev 97951)
+++ zope.app.security/trunk/src/zope/app/security/browser/loginlogout.txt	2009-03-12 03:23:55 UTC (rev 97952)
@@ -12,8 +12,8 @@
 When the current principal is unauthenticated, it provides
 IUnauthenticatedPrincipal:
 
-  >>> from zope.app.security.interfaces import IUnauthenticatedPrincipal
-  >>> from zope.app.security.principalregistry import UnauthenticatedPrincipal
+  >>> from zope.authentication.interfaces import IUnauthenticatedPrincipal
+  >>> from zope.principalregistry.principalregistry import UnauthenticatedPrincipal
   >>> anonymous = UnauthenticatedPrincipal('anon', '', '')
   >>> IUnauthenticatedPrincipal.providedBy(anonymous)
   True
@@ -55,12 +55,12 @@
 To show a logout prompt, an admin must register a marker adapter that provides
 the interface:
 
-  >>> from zope.app.security.interfaces import ILogoutSupported
+  >>> from zope.authentication.interfaces import ILogoutSupported
 
 This flags to LoginLogout that the site supports logout. There is a 'no-op'
 adapter that can be registered for this:
 
-  >>> from zope.app.security import LogoutSupported
+  >>> from zope.authentication.logout import LogoutSupported
   >>> from zope.app.testing import ztapi
   >>> ztapi.provideAdapter(None, ILogoutSupported, LogoutSupported)
 

Modified: zope.app.security/trunk/src/zope/app/security/browser/tests.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/browser/tests.py	2009-03-12 03:23:29 UTC (rev 97951)
+++ zope.app.security/trunk/src/zope/app/security/browser/tests.py	2009-03-12 03:23:55 UTC (rev 97952)
@@ -42,7 +42,3 @@
                              setUp=placelesssetup.setUp,
                              tearDown=placelesssetup.tearDown),
         ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
-

Modified: zope.app.security/trunk/src/zope/app/security/tests/__init__.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/tests/__init__.py	2009-03-12 03:23:29 UTC (rev 97951)
+++ zope.app.security/trunk/src/zope/app/security/tests/__init__.py	2009-03-12 03:23:55 UTC (rev 97952)
@@ -15,20 +15,5 @@
 
 $Id$
 """
-import zope.component
-from zope.security.interfaces import IPermission
-from zope.security.permission import Permission
 
-# XXX: move this to zope.security.testing
-def addCheckerPublic():
-    """Add the CheckerPublic permission as 'zope.Public'"""
-
-    perm = Permission('zope.Public', 'Public',
-            """Special permission used for resources that are always public
-
-            The public permission is effectively an optimization, sine
-            it allows security computation to be bypassed.
-            """
-            )
-    gsm = zope.component.getGlobalSiteManager()
-    gsm.registerUtility(perm, IPermission, perm.id)
+from zope.security.testing import addCheckerPublic # BBB