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

More unicode support

Browse source
This commit is contained in:
Manuel Ebert 2014-01-23 15:14:20 +01:00
parent d35502423a
commit 46951cbe12
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -4,7 +4,7 @@ Changelog
### 1.7 (December 22, 2013) ### 1.7 (December 22, 2013)
* __1.7.7__ Cleaned up imporrts * __1.7.7__ Cleaned up imports, better unicode support
* __1.7.6__ Python 3 port for slugify * __1.7.6__ Python 3 port for slugify
* __1.7.5__ Colorama is only needed on windows. Smaller fixes * __1.7.5__ Colorama is only needed on windows. Smaller fixes
* __1.7.3__ Touches temporary files before opening them to allow more external editors. * __1.7.3__ Touches temporary files before opening them to allow more external editors.

4
features/steps/core.py
View file

@ -129,11 +129,15 @@ def check_output_time_inline(context, text):
@then('the output should contain "{text}"') @then('the output should contain "{text}"')
def check_output_inline(context, text): def check_output_inline(context, text):
out = context.stdout_capture.getvalue() out = context.stdout_capture.getvalue()
if isinstance(out, bytes):
out = out.decode('utf-8')
assert text in out assert text in out
@then('the output should not contain "{text}"') @then('the output should not contain "{text}"')
def check_output_not_inline(context, text): def check_output_not_inline(context, text):
out = context.stdout_capture.getvalue() out = context.stdout_capture.getvalue()
if isinstance(out, bytes):
out = out.decode('utf-8')
assert text not in out assert text not in out
@then('we should see the message "{text}"') @then('we should see the message "{text}"')

11
jrnl/cli.py
View file

@ -115,7 +115,8 @@ def run(manual_args=None):
args = parse_args(manual_args) args = parse_args(manual_args)
if args.version: if args.version:
print("{0} version {1}".format(jrnl.__title__, jrnl.__version__)) version_str = "{0} version {1}".format(jrnl.__title__, jrnl.__version__)
print(util.py2encode(version_str))
sys.exit(0) sys.exit(0)
# If the first textual argument points to a journal file, # If the first textual argument points to a journal file,
@ -181,17 +182,17 @@ def run(manual_args=None):
# Reading mode # Reading mode
if not mode_compose and not mode_export: if not mode_compose and not mode_export:
print(journal.pprint()) print(util.py2encode(journal.pprint()))
# Various export modes # Various export modes
elif args.short: elif args.short:
print(journal.pprint(short=True)) print(util.py2encode(journal.pprint(short=True)))
elif args.tags: elif args.tags:
print(exporters.to_tag_list(journal)) print(util.py2encode(exporters.to_tag_list(journal)))
elif args.export is not False: elif args.export is not False:
print(exporters.export(journal, args.export, args.output)) print(util.py2encode(exporters.export(journal, args.export, args.output)))
elif (args.encrypt is not False or args.decrypt is not False) and not PYCRYPTO: elif (args.encrypt is not False or args.decrypt is not False) and not PYCRYPTO:
util.prompt("PyCrypto not found. To encrypt or decrypt your journal, install the PyCrypto package from http://www.pycrypto.org.") util.prompt("PyCrypto not found. To encrypt or decrypt your journal, install the PyCrypto package from http://www.pycrypto.org.")

4
jrnl/util.py
View file

@ -65,6 +65,10 @@ def u(s):
"""Mock unicode function for python 2 and 3 compatibility.""" """Mock unicode function for python 2 and 3 compatibility."""
return s if PY3 or type(s) is unicode else unicode(s.encode('string-escape'), "unicode_escape") return s if PY3 or type(s) is unicode else unicode(s.encode('string-escape'), "unicode_escape")
def py2encode(s):
"""Encode in Python 2, but not in python 3."""
return s.encode("utf-8") if PY2 and type(s) is unicode else s
def prompt(msg): def prompt(msg):
"""Prints a message to the std err stream defined in util.""" """Prints a message to the std err stream defined in util."""
if not msg.endswith("\n"): if not msg.endswith("\n"):