IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed cStringIO and StringIO module compatibility in python

Browse Source
This commit is contained in:
Akshay Joshi 2016-05-13 11:22:59 +05:30
parent f682f06c94
commit 8e4e1640e7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/misc/bgprocess/process_executor.py
View File

@ -45,12 +45,12 @@ import codecs
# SQLite3 needs all string as UTF-8 # SQLite3 needs all string as UTF-8
# We need to make string for Python2/3 compatible # We need to make string for Python2/3 compatible
if sys.version_info < (3,): if sys.version_info < (3,):
from io import StringIO from StringIO import StringIO
def u(x): def u(x):
return codecs.unicode_escape_decode(x)[0] return codecs.unicode_escape_decode(x)[0]
else: else:
from cStringIO import StringIO from io import StringIO
def u(x): def u(x):
return x return x

2
web/pgadmin/misc/bgprocess/processes.py
View File

@ -32,7 +32,7 @@ from pgadmin.model import Process, db
if sys.version_info < (3,): if sys.version_info < (3,):
from StringIO import StringIO from StringIO import StringIO
else: else:
from cStringIO import StringIO from io import StringIO
def get_current_time(format='%Y-%m-%d %H:%M:%S.%f %z'): def get_current_time(format='%Y-%m-%d %H:%M:%S.%f %z'):