From 30275492d482841a0510d39db0c37045b0f3d033 Mon Sep 17 00:00:00 2001 From: Manuel Ebert Date: Sun, 20 Oct 2013 13:42:55 -0700 Subject: [PATCH] Only soft-deprecate passwords in config --- jrnl/Journal.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/jrnl/Journal.py b/jrnl/Journal.py index 116b6c9a..ecc9a4d7 100644 --- a/jrnl/Journal.py +++ b/jrnl/Journal.py @@ -99,14 +99,21 @@ class Journal(object): Entries have the form (date, title, body).""" filename = filename or self.config['journal'] - def validate_password(journal, password): - self.make_key(password) - return self._decrypt(journal) if self.config['encrypt']: with open(filename, "rb") as f: journal_encrypted = f.read() - journal = util.get_password(keychain=self.name, validator=partial(validate_password, journal_encrypted)) + + def validate_password(password): + self.make_key(password) + return self._decrypt(journal_encrypted) + + # Soft-deprecated: + journal = None + if 'password' in self.config: + journal = validate_password(self.config['password']) + if not journal: + journal = util.get_password(keychain=self.name, validator=validate_password) else: with codecs.open(filename, "r", "utf-8") as f: journal = f.read()