fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #346 from ametheus/patch-2

Browse source 
Fix improper charset handling in PY2 path of u(x)
This commit is contained in:
Manuel Ebert 2015-04-20 14:42:41 +02:00
commit 4f23169d4e
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
jrnl/util.py
View file

@ -67,12 +67,7 @@ def set_keychain(journal_name, password):
def u(s):
"""Mock unicode function for python 2 and 3 compatibility."""
if PY3:
return str(s)
elif isinstance(s, basestring) and type(s) is not unicode:
return unicode(s.encode('string-escape'), "unicode_escape")
return unicode(s)
return s if PY3 or type(s) is unicode else s.decode("utf-8")
def py2encode(s):
"""Encodes to UTF-8 in Python 2 but not r."""