[Erp5-report] r30910 - /experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/
nobody at svn.erp5.org
nobody at svn.erp5.org
Sat Nov 28 21:36:14 CET 2009
Author: yo
Date: Sat Nov 28 21:36:14 2009
New Revision: 30910
URL: http://svn.erp5.org?rev=30910&view=rev
Log:
Shut up deprecation warningsin Python 2.6 and Zope 2.12.
Modified:
experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LanguageManager.py
experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalContent.py
experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalFiles.py
experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalFolder.py
experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalPropertyManager.py
experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/Localizer.py
experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/MessageCatalog.py
experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/utils.py
Modified: experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LanguageManager.py
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LanguageManager.py?rev=30910&r1=30909&r2=30910&view=diff
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LanguageManager.py [utf8] (original)
+++ experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LanguageManager.py [utf8] Sat Nov 28 21:36:14 2009
@@ -21,7 +21,10 @@
from itools.i18n import get_language_name, get_languages
# Import from Zope
-from Globals import InitializeClass
+try:
+ from App.class_init import InitializeClass
+except ImportError:
+ from Globals import InitializeClass
from AccessControl import ClassSecurityInfo
# Import from Localizer
Modified: experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalContent.py
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalContent.py?rev=30910&r1=30909&r2=30910&view=diff
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalContent.py [utf8] (original)
+++ experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalContent.py [utf8] Sat Nov 28 21:36:14 2009
@@ -17,7 +17,10 @@
# Import from the Standard Library
from cgi import escape
from cStringIO import StringIO
-import md5
+try:
+ from hashlib import md5
+except ImportError:
+ from md5 import md5
from types import StringType, UnicodeType
from xml.sax import make_parser, handler, InputSource
@@ -31,7 +34,14 @@
from OFS.PropertyManager import PropertyManager
from Products.ZCatalog.CatalogPathAwareness import CatalogAware
from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass, MessageDialog
+try:
+ from App.class_init import InitializeClass
+except ImportError:
+ from Globals import InitializeClass
+try:
+ from App.Dialogs import MessageDialog
+except ImportError:
+ from Globals import MessageDialog
# Import from Localizer
from LocalFiles import LocalDTMLFile
@@ -43,7 +53,7 @@
"""Create an MD5 sum (or hash) of a text. It is guaranteed to be 32 bytes
long.
"""
- return md5.new(str.encode('utf-8')).hexdigest()
+ return md5(str.encode('utf-8')).hexdigest()
manage_addLocalContentForm = LocalDTMLFile('ui/LocalContent_add', globals())
Modified: experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalFiles.py
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalFiles.py?rev=30910&r1=30909&r2=30910&view=diff
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalFiles.py [utf8] (original)
+++ experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalFiles.py [utf8] Sat Nov 28 21:36:14 2009
@@ -27,7 +27,10 @@
import os
# Import Zope modules
-from Globals import DTMLFile
+try:
+ from App.special_dtml import DTMLFile
+except ImportError:
+ from Globals import DTMLFile
# Import from Localizer
from utils import DomainAware
Modified: experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalFolder.py
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalFolder.py?rev=30910&r1=30909&r2=30910&view=diff
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalFolder.py [utf8] (original)
+++ experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalFolder.py [utf8] Sat Nov 28 21:36:14 2009
@@ -15,7 +15,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Import from Zope
-from Globals import package_home
+try:
+ from App.Common import package_home
+except ImportError:
+ from Globals import package_home
from OFS.Folder import Folder
# Import from Localizer
Modified: experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalPropertyManager.py
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalPropertyManager.py?rev=30910&r1=30909&r2=30910&view=diff
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalPropertyManager.py [utf8] (original)
+++ experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/LocalPropertyManager.py [utf8] Sat Nov 28 21:36:14 2009
@@ -20,7 +20,10 @@
# Import from Zope
from AccessControl import ClassSecurityInfo
-import Globals
+try:
+ from App.class_init import InitializeClass
+except ImportError:
+ from Globals import InitializeClass
# Import from Localizer
from LanguageManager import LanguageManager
@@ -339,4 +342,4 @@
-Globals.InitializeClass(LocalPropertyManager)
+InitializeClass(LocalPropertyManager)
Modified: experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/Localizer.py
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/Localizer.py?rev=30910&r1=30909&r2=30910&view=diff
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/Localizer.py [utf8] (original)
+++ experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/Localizer.py [utf8] Sat Nov 28 21:36:14 2009
@@ -22,7 +22,14 @@
# Import from Zope
from AccessControl import ClassSecurityInfo
-from Globals import DTMLFile, InitializeClass
+try:
+ from App.special_dtml import DTMLFile
+except ImportError:
+ from Globals import DTMLFile
+try:
+ from App.class_init import InitializeClass
+except ImportError:
+ from Globals import InitializeClass
from OFS.Folder import Folder
from ZPublisher.BeforeTraverse import registerBeforeTraverse, \
unregisterBeforeTraverse, queryBeforeTraverse, NameCaller
Modified: experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/MessageCatalog.py
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/MessageCatalog.py?rev=30910&r1=30909&r2=30910&view=diff
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/MessageCatalog.py [utf8] (original)
+++ experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/MessageCatalog.py [utf8] Sat Nov 28 21:36:14 2009
@@ -23,7 +23,10 @@
# Import from the Standard Library
from base64 import encodestring, decodestring
-import md5
+try:
+ from hashlib import md5
+except ImportError:
+ from md5 import md5
from re import compile
from time import gmtime, strftime, time
from urllib import quote
@@ -37,7 +40,18 @@
# Import from Zope
from AccessControl import ClassSecurityInfo
from Acquisition import aq_base
-from Globals import MessageDialog, PersistentMapping, InitializeClass
+try:
+ from App.Dialogs import MessageDialog
+except ImportError:
+ from Globals import MessageDialog
+try:
+ from Persistence import PersistentMapping
+except ImportError:
+ from Globals import PersistentMapping
+try:
+ from App.class_init import InitializeClass
+except ImportError:
+ from Globals import InitializeClass
from OFS.ObjectManager import ObjectManager
from OFS.SimpleItem import SimpleItem
from ZPublisher import HTTPRequest
@@ -60,7 +74,7 @@
"""Create an MD5 sum (or hash) of a text. It is guaranteed to be 32 bytes
long.
"""
- return md5.new(str.encode('utf-8')).hexdigest()
+ return md5(str.encode('utf-8')).hexdigest()
def to_unicode(x):
Modified: experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/utils.py
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/utils.py?rev=30910&r1=30909&r2=30910&view=diff
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/utils.py [utf8] (original)
+++ experimental/erp5.buildout-zope-2.12/trunk/src/Products/Localizer/utils.py [utf8] Sat Nov 28 21:36:14 2009
@@ -20,7 +20,10 @@
from itools.gettext import get_domain, register_domain
# Import from Zope
-from Globals import package_home
+try:
+ from App.Common import package_home
+except ImportError:
+ from Globals import package_home
# Import from Localizer
from patches import get_request
More information about the Erp5-report
mailing list