Use cStringIO everywhere when available for issue81 thanks htgoebel
This commit is contained in:
1 parent
8b6e3b8d77
commit
a25ce9411b
5 files changed
+23
-7
No files matched your search
@@ -1,6 +1,9 @@
|
||||
"Translation"
|
||||
import base64
|
||||
from StringIO import StringIO
|
||||
try:
|
||||
import cStringIO as StringIO
|
||||
except ImportError:
|
||||
import StringIO
|
||||
import csv
|
||||
from trytond.osv import fields, OSV, Cacheable
|
||||
from trytond.wizard import Wizard, WizardOSV
|
||||
@@ -397,7 +400,7 @@ class Translation(OSV, Cacheable):
|
||||
db_id2fs_id.setdefault(model_data.model, {})
|
||||
db_id2fs_id[model_data.model][model_data.db_id] = model_data.fs_id
|
||||
|
||||
buf = StringIO()
|
||||
buf = StringIO.StringIO()
|
||||
writer = csv.writer(buf, 'TRYTON')
|
||||
writer.writerow(HEADER)
|
||||
|
||||
|
||||
+5
-2
@@ -1,6 +1,9 @@
|
||||
import socket
|
||||
import cPickle
|
||||
import cStringIO
|
||||
try:
|
||||
import cStringIO as StringIO
|
||||
except ImportError:
|
||||
import StringIO
|
||||
|
||||
DNS_CACHE = {}
|
||||
|
||||
@@ -161,7 +164,7 @@ class PySocket:
|
||||
if chunk == '':
|
||||
raise RuntimeError, "socket connection broken"
|
||||
msg = msg + chunk
|
||||
msgio = cStringIO.StringIO(msg)
|
||||
msgio = StringIO.StringIO(msg)
|
||||
unpickler = cPickle.Unpickler(msgio)
|
||||
unpickler.find_global = checkfunction
|
||||
res = unpickler.load()
|
||||
|
||||
@@ -7,7 +7,10 @@ from xml import dom
|
||||
from trytond.osv import ExceptORM, ExceptOSV, OSV
|
||||
import sys
|
||||
import base64
|
||||
import StringIO
|
||||
try:
|
||||
import cStringIO as StringIO
|
||||
except ImportError:
|
||||
import StringIO
|
||||
import zipfile
|
||||
import locale
|
||||
import time
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
"Convert"
|
||||
import re
|
||||
import StringIO, xml.dom.minidom
|
||||
try:
|
||||
import cStringIO as StringIO
|
||||
except ImportError:
|
||||
import StringIO
|
||||
import xml.dom.minidom
|
||||
from trytond import pooler
|
||||
from trytond.osv.fields import Integer
|
||||
import csv
|
||||
|
||||
@@ -9,6 +9,10 @@ import socket
|
||||
import zipfile
|
||||
from trytond import pooler
|
||||
from threading import Semaphore
|
||||
try:
|
||||
import cStringIO as StringIO
|
||||
except ImportError:
|
||||
import StringIO
|
||||
|
||||
if sys.version_info[:2] < (2, 4):
|
||||
from threadinglocal import local
|
||||
@@ -89,7 +93,6 @@ def file_open(name, mode="r", subdir='modules'):
|
||||
else:
|
||||
zipname = tail
|
||||
if zipfile.is_zipfile(head+'.zip'):
|
||||
import StringIO
|
||||
zfile = zipfile.ZipFile(head+'.zip')
|
||||
try:
|
||||
return StringIO.StringIO(zfile.read(os.path.join(
|
||||
|
||||
Reference in new issue
Block a user