Commit 31138ed2 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

remove code for python2.3 compatibility.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25403 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 87ec8ae7
...@@ -47,10 +47,7 @@ from xml.dom.minidom import parse ...@@ -47,10 +47,7 @@ from xml.dom.minidom import parse
import struct import struct
import cPickle import cPickle
import posixpath import posixpath
try: from base64 import b64encode, b64decode
from base64 import b64encode, b64decode
except ImportError:
from base64 import encodestring as b64encode, decodestring as b64decode
from Products.ERP5Type.Message import translateString from Products.ERP5Type.Message import translateString
from zLOG import LOG, INFO from zLOG import LOG, INFO
......
...@@ -54,16 +54,7 @@ try: ...@@ -54,16 +54,7 @@ try:
except ImportError: except ImportError:
pysvn = None pysvn = None
try: from base64 import b64encode, b64decode
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
NBSP = ' ' NBSP = ' '
NBSP_TAB = NBSP*8 NBSP_TAB = NBSP*8
......
...@@ -40,12 +40,7 @@ from DateTime import DateTime ...@@ -40,12 +40,7 @@ from DateTime import DateTime
from zLOG import LOG, DEBUG, INFO from zLOG import LOG, DEBUG, INFO
import md5 import md5
from base64 import b64encode, b64decode, b16encode, b16decode
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
#class Conflict(SyncCode, Implicit): #class Conflict(SyncCode, Implicit):
class Conflict(SyncCode, Base): class Conflict(SyncCode, Base):
......
...@@ -34,13 +34,7 @@ from AccessControl.SecurityManagement import newSecurityManager ...@@ -34,13 +34,7 @@ from AccessControl.SecurityManagement import newSecurityManager
from Products.ERP5SyncML.Conduit.ERP5Conduit import ERP5Conduit from Products.ERP5SyncML.Conduit.ERP5Conduit import ERP5Conduit
from Products.ERP5SyncML.SyncCode import SyncCode from Products.ERP5SyncML.SyncCode import SyncCode
from zLOG import LOG from zLOG import LOG
from base64 import b64encode, b64decode, b16encode, b16decode
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
class TestERP5SyncMLMixin: class TestERP5SyncMLMixin:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment