[Checkins] SVN: z3c.securitytool/trunk/src/z3c/securitytool/ Fixed deprecation warnings in code and tests.

Daniel Blackburn blackburnd at gmail.com
Sun Dec 2 18:29:37 EST 2007


Log message for revision 82083:
  Fixed deprecation warnings in code and tests.
  
  

Changed:
  U   z3c.securitytool/trunk/src/z3c/securitytool/README.txt
  U   z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py
  U   z3c.securitytool/trunk/src/z3c/securitytool/tests.py

-=-
Modified: z3c.securitytool/trunk/src/z3c/securitytool/README.txt
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/README.txt	2007-12-02 23:02:38 UTC (rev 82082)
+++ z3c.securitytool/trunk/src/z3c/securitytool/README.txt	2007-12-02 23:29:37 UTC (rev 82083)
@@ -19,7 +19,7 @@
   >>> from zope.app.folder import Folder, rootFolder
 
   >>> from zope.app.authentication.principalfolder import Principal
-  >>> from zope.app.securitypolicy.role import Role
+  >>> from zope.securitypolicy.role import Role
   >>> from zope.security.permission import Permission
 
   
@@ -70,7 +70,7 @@
 In order to assign the permissions to the roles, we must setup a role-
 permission Manager, which is used to map permissions to roles.
 
-  >>> from zope.app.securitypolicy.interfaces import IRolePermissionManager
+  >>> from zope.securitypolicy.interfaces import IRolePermissionManager
   >>> rolePermManager = IRolePermissionManager(concordTimes)
   
 Now we can use our ``rolePermManager`` to assign the roles. 
@@ -102,7 +102,7 @@
 In order to assign roles to our staff members, we must first create a
 principal-role manager.
 
-  >>> from zope.app.securitypolicy.interfaces import IPrincipalRoleManager
+  >>> from zope.securitypolicy.interfaces import IPrincipalRoleManager
   >>> prinRoleManager = IPrincipalRoleManager(concordTimes)
   
 And now we can assign the roles. At the Concord Times, Martin is an editor,
@@ -126,7 +126,7 @@
   
   
    >>> from zope.security import testing
-   >>> from zope.app.securitypolicy import zopepolicy
+   >>> from zope.securitypolicy import zopepolicy
 
   >>> policy = zopepolicy.ZopeSecurityPolicy()
   >>> participation = testing.Participation(markus)

Modified: z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py	2007-12-02 23:02:38 UTC (rev 82082)
+++ z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py	2007-12-02 23:29:37 UTC (rev 82083)
@@ -5,7 +5,7 @@
 from zope.publisher.interfaces import IRequest
 
 from zope.app.apidoc.presentation import getViewInfoDictionary
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.i18nmessageid import ZopeMessageFactory as _
 from zope.app.security.principalregistry import PrincipalRegistry
 
 # The following imports are just so we can have the Duplicate
@@ -19,7 +19,7 @@
 
 
 #from zope.app.securitypolicy.zopepolicy import settingsForObject
-from zope.app.session.interfaces import ISession
+from zope.session.interfaces import ISession
 from zope.app import zapi
 
 from z3c.securitytool import interfaces

Modified: z3c.securitytool/trunk/src/z3c/securitytool/tests.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/tests.py	2007-12-02 23:02:38 UTC (rev 82082)
+++ z3c.securitytool/trunk/src/z3c/securitytool/tests.py	2007-12-02 23:29:37 UTC (rev 82083)
@@ -29,17 +29,17 @@
 from zope.security.management import endInteraction
 
 from zope.app.testing import placelesssetup, ztapi
-from zope.app.securitypolicy.interfaces import IGrantInfo
-from zope.app.securitypolicy.interfaces import IPrincipalRoleManager
-from zope.app.securitypolicy.interfaces import IPrincipalPermissionManager
-from zope.app.securitypolicy.interfaces import IRolePermissionManager
-from zope.app.securitypolicy.principalpermission \
+from zope.securitypolicy.interfaces import IGrantInfo
+from zope.securitypolicy.interfaces import IPrincipalRoleManager
+from zope.securitypolicy.interfaces import IPrincipalPermissionManager
+from zope.securitypolicy.interfaces import IRolePermissionManager
+from zope.securitypolicy.principalpermission \
      import AnnotationPrincipalPermissionManager
-from zope.app.securitypolicy.principalrole \
+from zope.securitypolicy.principalrole \
      import AnnotationPrincipalRoleManager
-from zope.app.securitypolicy.rolepermission \
+from zope.securitypolicy.rolepermission \
      import AnnotationRolePermissionManager
-from zope.app.securitypolicy.grantinfo \
+from zope.securitypolicy.grantinfo \
      import AnnotationGrantInfo
 from zope.app.authentication import principalfolder
 



More information about the Checkins mailing list