[Erp5-report] r25403 - in /erp5/trunk/products: ERP5/Tool/ ERP5Subversion/Tool/ ERP5SyncML/...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Sat Jan 31 20:18:54 2009
New Revision: 25403

URL: http://svn.erp5.org?rev=25403&view=rev
Log:
remove code for python2.3 compatibility.

Modified:
    erp5/trunk/products/ERP5/Tool/TemplateTool.py
    erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
    erp5/trunk/products/ERP5SyncML/Subscription.py
    erp5/trunk/products/ERP5SyncML/tests/testERP5SyncML.py

Modified: erp5/trunk/products/ERP5/Tool/TemplateTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/TemplateTool.py?rev=25403&r1=25402&r2=25403&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/TemplateTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Tool/TemplateTool.py [utf8] Sat Jan 31 20:18:54 2009
@@ -47,10 +47,7 @@
 import struct
 import cPickle
 import posixpath
-try:
-  from base64 import b64encode, b64decode
-except ImportError:
-  from base64 import encodestring as b64encode, decodestring as b64decode
+from base64 import b64encode, b64decode
 from Products.ERP5Type.Message import translateString
 from zLOG import LOG, INFO
 

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=25403&r1=25402&r2=25403&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py [utf8] Sat Jan 31 20:18:54 2009
@@ -54,16 +54,7 @@
 except ImportError:
   pysvn = None
 
-try:
-  from base64 import b64encode, b64decode
-except ImportError:
-  from base64 import encodestring as b64encode, decodestring as b64decode
-  
-# To keep compatibility with python 2.3
-try:
-  set
-except NameError:
-  from sets import Set as set
+from base64 import b64encode, b64decode
 
 NBSP = ' '
 NBSP_TAB = NBSP*8

Modified: erp5/trunk/products/ERP5SyncML/Subscription.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/Subscription.py?rev=25403&r1=25402&r2=25403&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/Subscription.py [utf8] (original)
+++ erp5/trunk/products/ERP5SyncML/Subscription.py [utf8] Sat Jan 31 20:18:54 2009
@@ -40,12 +40,7 @@
 from zLOG import LOG, DEBUG, INFO
 
 import md5
-
-try:
-    from base64 import b64encode, b64decode, b16encode, b16decode
-except ImportError:
-    from base64 import encodestring as b64encode, decodestring as b64decode, \
-        encodestring as b16encode, decodestring as b16decode
+from base64 import b64encode, b64decode, b16encode, b16decode
 
 #class Conflict(SyncCode, Implicit):
 class Conflict(SyncCode, Base):

Modified: erp5/trunk/products/ERP5SyncML/tests/testERP5SyncML.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/tests/testERP5SyncML.py?rev=25403&r1=25402&r2=25403&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/tests/testERP5SyncML.py [utf8] (original)
+++ erp5/trunk/products/ERP5SyncML/tests/testERP5SyncML.py [utf8] Sat Jan 31 20:18:54 2009
@@ -34,13 +34,7 @@
 from Products.ERP5SyncML.Conduit.ERP5Conduit import ERP5Conduit
 from Products.ERP5SyncML.SyncCode import SyncCode
 from zLOG import LOG
-
-try:
-    from base64 import b64encode, b64decode, b16encode, b16decode
-except ImportError:
-    from base64 import encodestring as b64encode, decodestring as b64decode, \
-        encodestring as b16encode, decodestring as b16decode
-
+from base64 import b64encode, b64decode, b16encode, b16decode
 
 class TestERP5SyncMLMixin: