Merge pull request #149 from maebert/unicode-fixes

Even more unicode fixes

CHANGELOG.md

@@ -4,6 +4,7 @@ Changelog
 
 ### 1.7 (December 22, 2013)
 
+* __1.7.16__ Even more unicode fixes!
 * __1.7.15__ More unicode fixes
 * __1.7.14__ Fix for trailing whitespaces (eg. when writing markdown code block)
 * __1.7.13__ Fix for UTF-8 in DayOne journals

jrnl/__init__.py

@@ -8,7 +8,7 @@ jrnl is a simple journal application for your command line.
 from __future__ import absolute_import
 
 __title__ = 'jrnl'
-__version__ = '1.7.15'
+__version__ = '1.7.16'
 __author__ = 'Manuel Ebert'
 __license__ = 'MIT License'
 __copyright__ = 'Copyright 2013 - 2014 Manuel Ebert'

jrnl/cli.py

@@ -110,7 +110,7 @@ def update_config(config, new_config, scope, force_local=False):
 
 def run(manual_args=None):
     args = parse_args(manual_args)
-
+    args.text = [p.decode('utf-8') if util.PY2 and not isinstance(p, unicode) else p for p in args.text]
     if args.version:
         version_str = "{0} version {1}".format(jrnl.__title__, jrnl.__version__)
         print(util.py2encode(version_str))