[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/securitypolicy/ remove zope.app.i18n dep, clean imports

[Bernd Dorn]

Log message for revision 73662:
  remove zope.app.i18n dep, clean imports

Changed:
  U   Zope3/trunk/src/zope/app/securitypolicy/browser/granting.py
  U   Zope3/trunk/src/zope/app/securitypolicy/browser/rolepermissionview.py
  A   Zope3/trunk/src/zope/app/securitypolicy/i18n.py
  U   Zope3/trunk/src/zope/app/securitypolicy/role.py
  U   Zope3/trunk/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py
  U   Zope3/trunk/src/zope/app/securitypolicy/tests/test_principalrolemanager.py
  U   Zope3/trunk/src/zope/app/securitypolicy/tests/test_securitymap.py
  U   Zope3/trunk/src/zope/app/securitypolicy/tests/test_zopepolicy.py

-=-
Modified: Zope3/trunk/src/zope/app/securitypolicy/browser/granting.py
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/browser/granting.py	2007-03-27 06:46:31 UTC (rev 73661)
+++ Zope3/trunk/src/zope/app/securitypolicy/browser/granting.py	2007-03-27 06:52:40 UTC (rev 73662)
@@ -25,7 +25,7 @@
 from zope.app.form.browser import RadioWidget
 from zope.app.form.browser.widget import renderElement
 from zope.app.form.interfaces import MissingInputError
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.app.securitypolicy.i18n import ZopeMessageFactory as _
 
 from zope.app.form.interfaces import IInputWidget
 from zope.app.securitypolicy.interfaces import Allow, Unset, Deny

Modified: Zope3/trunk/src/zope/app/securitypolicy/browser/rolepermissionview.py
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/browser/rolepermissionview.py	2007-03-27 06:46:31 UTC (rev 73661)
+++ Zope3/trunk/src/zope/app/securitypolicy/browser/rolepermissionview.py	2007-03-27 06:52:40 UTC (rev 73662)
@@ -22,7 +22,7 @@
 from zope.exceptions.interfaces import UserError
 
 from zope.app import zapi
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.app.securitypolicy.i18n import ZopeMessageFactory as _
 from zope.app.security.interfaces import IPermission
 from zope.app.securitypolicy.interfaces import Unset, Allow, Deny
 from zope.app.securitypolicy.interfaces import IRole, IRolePermissionManager

Added: Zope3/trunk/src/zope/app/securitypolicy/i18n.py
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/i18n.py	2007-03-27 06:46:31 UTC (rev 73661)
+++ Zope3/trunk/src/zope/app/securitypolicy/i18n.py	2007-03-27 06:52:40 UTC (rev 73662)
@@ -0,0 +1,22 @@
+##############################################################################
+#
+# Copyright (c) 2003 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Customization of zope.i18n for the Zope application server
+
+$Id$
+"""
+__docformat__ = 'restructuredtext'
+
+# import this as _ to create i18n messages in the zope domain
+from zope.i18nmessageid import MessageFactory
+ZopeMessageFactory = MessageFactory('zope')


Property changes on: Zope3/trunk/src/zope/app/securitypolicy/i18n.py
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Modified: Zope3/trunk/src/zope/app/securitypolicy/role.py
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/role.py	2007-03-27 06:46:31 UTC (rev 73661)
+++ Zope3/trunk/src/zope/app/securitypolicy/role.py	2007-03-27 06:52:40 UTC (rev 73662)
@@ -25,7 +25,7 @@
 
 from zope.app.securitypolicy.interfaces import IRole
 
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.app.securitypolicy.i18n import ZopeMessageFactory as _
 NULL_ID = _('<role not activated>')
 
 

Modified: Zope3/trunk/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py	2007-03-27 06:46:31 UTC (rev 73661)
+++ Zope3/trunk/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py	2007-03-27 06:52:40 UTC (rev 73662)
@@ -20,7 +20,6 @@
 from zope.interface import implements
 from zope.annotation.interfaces import IAttributeAnnotatable
 
-from zope.app.testing import ztapi
 from zope.app.security.principalregistry import principalRegistry
 from zope.app.component.testing import PlacefulSetup
 

Modified: Zope3/trunk/src/zope/app/securitypolicy/tests/test_principalrolemanager.py
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/tests/test_principalrolemanager.py	2007-03-27 06:46:31 UTC (rev 73661)
+++ Zope3/trunk/src/zope/app/securitypolicy/tests/test_principalrolemanager.py	2007-03-27 06:52:40 UTC (rev 73662)
@@ -17,7 +17,6 @@
 """
 import unittest
 
-from zope.app import zapi
 from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import PlacelessSetup
 

Modified: Zope3/trunk/src/zope/app/securitypolicy/tests/test_securitymap.py
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/tests/test_securitymap.py	2007-03-27 06:46:31 UTC (rev 73661)
+++ Zope3/trunk/src/zope/app/securitypolicy/tests/test_securitymap.py	2007-03-27 06:52:40 UTC (rev 73662)
@@ -16,7 +16,6 @@
 $Id$
 """
 import unittest
-from zope.interface.verify import verifyClass
 from zope.app.securitypolicy.securitymap import SecurityMap
 from zope.app.securitypolicy.securitymap import PersistentSecurityMap
 from zope.security.management import setSecurityPolicy, getInteraction

Modified: Zope3/trunk/src/zope/app/securitypolicy/tests/test_zopepolicy.py
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/tests/test_zopepolicy.py	2007-03-27 06:46:31 UTC (rev 73661)
+++ Zope3/trunk/src/zope/app/securitypolicy/tests/test_zopepolicy.py	2007-03-27 06:52:40 UTC (rev 73662)
@@ -24,7 +24,6 @@
 from zope.annotation.attribute import AttributeAnnotations
 from zope.security.management import endInteraction
 
-from zope.app import zapi
 from zope.app.testing import placelesssetup, ztapi
 from zope.app.securitypolicy.interfaces import IGrantInfo
 from zope.app.securitypolicy.interfaces import IPrincipalRoleManager