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 #399 from philipsd6/2.0-upgrade_unicode_and_tildes

Browse source 
Support unicode and userdir expansion in config during 2.0 upgrade
This commit is contained in:
Manuel Ebert 2016-02-10 10:41:06 -08:00
commit 3b7508eac6
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
jrnl/upgrade.py
View file

@ -6,10 +6,12 @@ from . import util
from .EncryptedJournal import EncryptedJournal
import sys
import os
import codecs
def backup(filename, binary=False):
util.prompt(" Created a backup at {}.backup".format(filename))
filename = os.path.expanduser(os.path.expandvars(filename))
with open(filename, 'rb' if binary else 'r') as original:
contents = original.read()
with open(filename + ".backup", 'wb' if binary else 'w') as backup:
@ -17,7 +19,7 @@ def backup(filename, binary=False):
def upgrade_jrnl_if_necessary(config_path):
with open(config_path) as f:
with codecs.open(config_path, "r", "utf-8") as f:
config_file = f.read()
if not config_file.strip().startswith("{"):
return