[Checkins] SVN: zope.app.security/trunk/s - avoid deprecation warning (removing a dependency in the process)

Fred L. Drake, Jr. fdrake at gmail.com
Fri Oct 19 11:44:40 EDT 2007


Log message for revision 80937:
  - avoid deprecation warning (removing a dependency in the process)
  - remove silly setup.cfg
  

Changed:
  D   zope.app.security/trunk/setup.cfg
  U   zope.app.security/trunk/setup.py
  U   zope.app.security/trunk/src/zope/app/security/browser/auth.py
  A   zope.app.security/trunk/src/zope/app/security/i18n.py
  U   zope.app.security/trunk/src/zope/app/security/permission.py

-=-
Deleted: zope.app.security/trunk/setup.cfg
===================================================================
--- zope.app.security/trunk/setup.cfg	2007-10-19 15:30:46 UTC (rev 80936)
+++ zope.app.security/trunk/setup.cfg	2007-10-19 15:44:39 UTC (rev 80937)
@@ -1,2 +0,0 @@
-[egg_info]
-tag_svn_revision = 1
\ No newline at end of file

Modified: zope.app.security/trunk/setup.py
===================================================================
--- zope.app.security/trunk/setup.py	2007-10-19 15:30:46 UTC (rev 80936)
+++ zope.app.security/trunk/setup.py	2007-10-19 15:44:39 UTC (rev 80937)
@@ -35,7 +35,6 @@
                         'zope.app.component',
                         'zope.app.container',
                         'zope.app.form',
-                        'zope.app.i18n',
                         'zope.app.pagetemplate',
                         'zope.app.publisher',
                         'zope.component',

Modified: zope.app.security/trunk/src/zope/app/security/browser/auth.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/browser/auth.py	2007-10-19 15:30:46 UTC (rev 80936)
+++ zope.app.security/trunk/src/zope/app/security/browser/auth.py	2007-10-19 15:44:39 UTC (rev 80937)
@@ -20,11 +20,11 @@
 from zope.i18n import translate
 from zope import component
 from zope.app.publisher.interfaces.http import ILogin
+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
-from zope.app.i18n import ZopeMessageFactory as _
 
 
 search_label = _('search-button', 'Search')

Added: zope.app.security/trunk/src/zope/app/security/i18n.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/i18n.py	                        (rev 0)
+++ zope.app.security/trunk/src/zope/app/security/i18n.py	2007-10-19 15:44:39 UTC (rev 80937)
@@ -0,0 +1,17 @@
+##############################################################################
+#
+# Copyright (c) 2007 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.
+#
+##############################################################################
+
+import zope.i18nmessageid
+
+_ = zope.i18nmessageid.MessageFactory("zope")


Property changes on: zope.app.security/trunk/src/zope/app/security/i18n.py
___________________________________________________________________
Name: svn:mime-type
   + text/x-python
Name: svn:eol-style
   + native

Modified: zope.app.security/trunk/src/zope/app/security/permission.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/permission.py	2007-10-19 15:30:46 UTC (rev 80936)
+++ zope.app.security/trunk/src/zope/app/security/permission.py	2007-10-19 15:44:39 UTC (rev 80937)
@@ -19,12 +19,11 @@
 
 from persistent import Persistent
 
+from zope.app.security.i18n import _
 from zope.interface import implements
 from zope.location import Location
 from zope.security.interfaces import IPermission
 
-from zope.app.i18n import ZopeMessageFactory as _
-
 NULL_ID = _('<permission not activated>')
 
 ##############################################################################



More information about the Checkins mailing list