From 7c72a98c00112e9ce6f11d6f150e071bb104c7a6 Mon Sep 17 00:00:00 2001 From: Manuel Ebert Date: Mon, 19 May 2014 14:43:38 -0700 Subject: [PATCH 1/2] Export to files using UTF-8 Fixes #162 --- jrnl/exporters.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jrnl/exporters.py b/jrnl/exporters.py index b8463e03..83499f87 100644 --- a/jrnl/exporters.py +++ b/jrnl/exporters.py @@ -5,6 +5,7 @@ from __future__ import absolute_import import os import json from .util import u, slugify +import codecs def get_tags_count(journal): @@ -81,7 +82,7 @@ def export(journal, format, output=None): content = maps[format](journal) if output: try: - with open(output, 'w') as f: + with codecs.open(output, "w", "utf-8") as f: f.write(content) return "[Journal exported to {0}]".format(output) except IOError as e: @@ -101,6 +102,6 @@ def write_files(journal, path, format): content = e.to_md() elif format == 'txt': content = u(e) - with open(full_path, 'w') as f: + with codecs.open(full_path, "w", "utf-8") as f: f.write(content) return "[Journal exported individual files in {0}]".format(path) From 05febbf9f65b8f05b30f85186c83341deb210439 Mon Sep 17 00:00:00 2001 From: Manuel Ebert Date: Mon, 19 May 2014 14:43:56 -0700 Subject: [PATCH 2/2] Changelog & version bump to 1.7.22 --- CHANGELOG.md | 1 + jrnl/__init__.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14b634d9..2eb1a0be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Changelog ### 1.7 (December 22, 2013) +* __1.7.22__ Fixed an issue with writing files when exporting entries containing non-ascii characters. * __1.7.21__ jrnl now uses PKCS#7 padding. * __1.7.20__ Minor fixes when parsing DayOne journals * __1.7.19__ Creates full path to journal during installation if it doesn't exist yet diff --git a/jrnl/__init__.py b/jrnl/__init__.py index eef08dc0..1e1dc0ec 100644 --- a/jrnl/__init__.py +++ b/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.21' +__version__ = '1.7.22' __author__ = 'Manuel Ebert' __license__ = 'MIT License' __copyright__ = 'Copyright 2013 - 2014 Manuel Ebert'