[Checkins] SVN: zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/ Found more incorrect deferredimports.

[Lennart Regebro]

Log message for revision 80467:
  Found more incorrect deferredimports.
  

Changed:
  U   zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/principalrole.py
  U   zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/rolepermission.py
  U   zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/vocabulary.py

-=-
Modified: zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/principalrole.py
===================================================================
--- zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/principalrole.py	2007-10-02 08:27:44 UTC (rev 80466)
+++ zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/principalrole.py	2007-10-02 08:39:01 UTC (rev 80467)
@@ -19,7 +19,7 @@
 import zope.deferredimport
 
 zope.deferredimport.deprecated(
-    "It has moved to zope.securitypolicy.principalpermission  This reference will be "
+    "It has moved to zope.securitypolicy.principalrole  This reference will be "
     "removed somedays",
     AnnotationPrincipalRoleManager = 'zope.securitypolicy.principalrole:AnnotationPrincipalRoleManager',
     PrincipalRoleManager = 'zope.securitypolicy.principalrole:PrincipalRoleManager',

Modified: zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/rolepermission.py
===================================================================
--- zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/rolepermission.py	2007-10-02 08:27:44 UTC (rev 80466)
+++ zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/rolepermission.py	2007-10-02 08:39:01 UTC (rev 80467)
@@ -21,7 +21,7 @@
 zope.deferredimport.deprecated(
     "It has moved to zope.securitypolicy.rolepermission  This reference will be "
     "removed somedays",
-    AnnotationRolePermissionManager = 'zope.securitypolicy.grantinfo:AnnotationRolePermissionManager',
-    RolePermissionManager = 'zope.securitypolicy.grantinfo:RolePermissionManager',
-    rolePermissionManager = 'zope.securitypolicy.grantinfo:rolePermissionManager',
+    AnnotationRolePermissionManager = 'zope.securitypolicy.rolepermission:AnnotationRolePermissionManager',
+    RolePermissionManager = 'zope.securitypolicy.rolepermission:RolePermissionManager',
+    rolePermissionManager = 'zope.securitypolicy.rolepermission:rolePermissionManager',
     )

Modified: zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/vocabulary.py
===================================================================
--- zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/vocabulary.py	2007-10-02 08:27:44 UTC (rev 80466)
+++ zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/vocabulary.py	2007-10-02 08:39:01 UTC (rev 80467)
@@ -21,8 +21,8 @@
 import zope.deferredimport
 
 zope.deferredimport.deprecated(
-    "It has moved to zope.securitypolicy.interfaces  This reference will be "
+    "It has moved to zope.securitypolicy.vocabulary  This reference will be "
     "removed somedays",
     RoleIdsVocabulary = 'zope.securitypolicy.vocabulary:RoleIdsVocabulary',
-    GrantVocabulary = 'zope.securitypolicy.grantinfo:GrantVocabulary',
+    GrantVocabulary = 'zope.securitypolicy.vocabulary:GrantVocabulary',
     )