Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Streamline conv_to_unicode

Browse Source 
Also handle "None" strings and change default encoding to 'utf8' so that
it works without args when converting from UI input.
This commit is contained in:
John Ralls 2014-04-06 13:09:37 -07:00
parent 3f4596ae4c
commit d48edcdcf7
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gramps/gen/constfunc.py
View File

@ -55,24 +55,17 @@ WINDOWS = ["Windows", "win32"]
#python 2 and 3 support, use correct conversion to unicode #python 2 and 3 support, use correct conversion to unicode
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
def conv_to_unicode(x, y=None):
if isinstance(x, unicode):
return x
return unicode(x, y) if y else unicode(x)
conv_to_unicode_direct = unicode conv_to_unicode_direct = unicode
STRTYPE = basestring STRTYPE = basestring
UNITYPE = unicode UNITYPE = unicode
else: else:
def conv_to_unicode(x, y):
if isinstance(x, str):
return x
else:
return x.decode(y)
conv_to_unicode_direct = str conv_to_unicode_direct = str
STRTYPE = str STRTYPE = str
UNITYPE = str UNITYPE = str
cuni = conv_to_unicode_direct cuni = conv_to_unicode_direct
def conv_to_unicode(x, y='utf8'):
return x if x is None or isinstance(x, UNITYPE) else cuni(x, y)
# handle in database is bytes, while internally Gramps wants unicode for py3 # handle in database is bytes, while internally Gramps wants unicode for py3
if sys.version_info[0] < 3: if sys.version_info[0] < 3: