Merge pull request #108 from maebert/#100

Squash of @alapolloni 's PR
This commit is contained in:
Manuel Ebert 2013-11-22 12:35:45 -08:00
commit e541b6bf3c

View file

@ -57,7 +57,7 @@ def set_keychain(journal_name, password):
def u(s):
"""Mock unicode function for python 2 and 3 compatibility."""
return s if PY3 or type(s) is unicode else unicode(s, "unicode_escape")
return s if PY3 or type(s) is unicode else unicode(s.encode('string-escape'), "unicode_escape")
def prompt(msg):
"""Prints a message to the std err stream defined in util."""