From 7c6e34deda7528f33e2f25d14237f76ee5de3f9c Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Fri, 30 Sep 2022 17:29:15 -0700 Subject: [PATCH] get rid of old PlainJournal class --- jrnl/Journal.py | 8 ++------ jrnl/upgrade.py | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/jrnl/Journal.py b/jrnl/Journal.py index a5bc63b3..2dfc1f34 100644 --- a/jrnl/Journal.py +++ b/jrnl/Journal.py @@ -379,10 +379,6 @@ class Journal: self.entries = mod_entries -class PlainJournal(Journal): - pass - - class LegacyJournal(Journal): """Legacy class to support opening journals formatted with the jrnl 1.x standard. Main difference here is that in 1.x, timestamps were not cuddled @@ -474,9 +470,9 @@ def open_journal(journal_name, config, legacy=False): from jrnl import FolderJournal return FolderJournal.Folder(journal_name, **config).open() - return PlainJournal(journal_name, **config).open() + return Journal(journal_name, **config).open() if legacy: config["encrypt"] = "jrnlv1" return LegacyJournal(journal_name, **config).open() - return PlainJournal(journal_name, **config).open() + return Journal(journal_name, **config).open() diff --git a/jrnl/upgrade.py b/jrnl/upgrade.py index 1764a94a..235cacb5 100644 --- a/jrnl/upgrade.py +++ b/jrnl/upgrade.py @@ -136,7 +136,7 @@ def upgrade_jrnl(config_path): logging.debug(f"Clearing encryption method for '{journal_name}' journal") # Update the encryption method - new_journal = Journal.PlainJournal.from_journal(old_journal) + new_journal = Journal.Journal.from_journal(old_journal) new_journal.config["encrypt"] = "jrnlv2" new_journal._get_encryption_method() # Copy over password (jrnlv1 only supported password-based encryption) @@ -159,7 +159,7 @@ def upgrade_jrnl(config_path): old_journal = Journal.open_journal( journal_name, scope_config(config, journal_name), legacy=True ) - all_journals.append(Journal.PlainJournal.from_journal(old_journal)) + all_journals.append(Journal.Journal.from_journal(old_journal)) # loop through lists to validate failed_journals = [j for j in all_journals if not j.validate_parsing()]