From e3a46e9846221ca37b122f2d739e79897bdb8841 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 11 Apr 2020 14:25:50 -0700 Subject: [PATCH] fix various small issues in the codebase --- features/steps/core.py | 7 +------ jrnl/EncryptedJournal.py | 1 - jrnl/FolderJournal.py | 1 - jrnl/__init__.py | 2 -- jrnl/cli.py | 2 +- jrnl/install.py | 3 --- jrnl/plugins/jrnl_importer.py | 2 -- jrnl/plugins/markdown_exporter.py | 1 - jrnl/plugins/template.py | 4 +--- jrnl/plugins/yaml_exporter.py | 8 +++----- 10 files changed, 6 insertions(+), 25 deletions(-) diff --git a/features/steps/core.py b/features/steps/core.py index f1f915fc..b69edb9e 100644 --- a/features/steps/core.py +++ b/features/steps/core.py @@ -10,13 +10,10 @@ try: except ImportError: import parsedatetime as pdt import time -from codecs import encode, decode import os import ast -import json import yaml import keyring -import tzlocal import shlex import sys from pathlib import Path @@ -203,7 +200,6 @@ def check_output(context, text=None): @then('the output should contain "{text}" in the local time') def check_output_time_inline(context, text): out = context.stdout_capture.getvalue() - local_tz = tzlocal.get_localzone() date, flag = CALENDAR.parse(text) output_date = time.strftime("%Y-%m-%d %H:%M", date) assert output_date in out, output_date @@ -230,7 +226,7 @@ def check_output_inline(context, text=None, text2=None): @then("the error output should contain") @then('the error output should contain "{text}"') @then('the error output should contain "{text}" or "{text2}"') -def check_output_inline(context, text=None, text2=None): +def check_error_output_inline(context, text=None, text2=None): text = text or context.text out = context.stderr_capture.getvalue() assert text in out or text2 in out, text or text2 @@ -299,7 +295,6 @@ def check_journal_entries(context, number, journal_name="default"): @when("the journal directory is listed") def list_journal_directory(context, journal="default"): - files = [] with open(install.CONFIG_FILE_PATH) as config_file: config = yaml.load(config_file, Loader=yaml.FullLoader) journal_path = config["journals"][journal] diff --git a/jrnl/EncryptedJournal.py b/jrnl/EncryptedJournal.py index cc5af748..66693c7e 100644 --- a/jrnl/EncryptedJournal.py +++ b/jrnl/EncryptedJournal.py @@ -10,7 +10,6 @@ import sys import os import base64 import logging -from typing import Optional log = logging.getLogger() diff --git a/jrnl/FolderJournal.py b/jrnl/FolderJournal.py index 19519a14..dcf4cfd0 100644 --- a/jrnl/FolderJournal.py +++ b/jrnl/FolderJournal.py @@ -2,7 +2,6 @@ # encoding: utf-8 from __future__ import absolute_import, unicode_literals -from . import Entry from . import Journal import codecs import os diff --git a/jrnl/__init__.py b/jrnl/__init__.py index eee0d268..8b0c4181 100644 --- a/jrnl/__init__.py +++ b/jrnl/__init__.py @@ -1,7 +1,5 @@ #!/usr/bin/env python -import os - try: from .__version__ import __version__ except ImportError: diff --git a/jrnl/cli.py b/jrnl/cli.py index 3f331217..bfb71319 100644 --- a/jrnl/cli.py +++ b/jrnl/cli.py @@ -365,7 +365,7 @@ def run(manual_args=None): try: journal = open_journal(journal_name, config) except KeyboardInterrupt: - print(f"[Interrupted while opening journal]", file=sys.stderr) + print("[Interrupted while opening journal]", file=sys.stderr) sys.exit(1) # Import mode diff --git a/jrnl/install.py b/jrnl/install.py index d8b3255f..f95ce9f7 100644 --- a/jrnl/install.py +++ b/jrnl/install.py @@ -1,14 +1,11 @@ #!/usr/bin/env python import glob -import getpass import os import xdg.BaseDirectory from . import util from . import upgrade from . import __version__ -from .Journal import PlainJournal -from .EncryptedJournal import EncryptedJournal from .util import UserAbort, verify_config import yaml import logging diff --git a/jrnl/plugins/jrnl_importer.py b/jrnl/plugins/jrnl_importer.py index 972114d4..9ea9ee26 100644 --- a/jrnl/plugins/jrnl_importer.py +++ b/jrnl/plugins/jrnl_importer.py @@ -2,7 +2,6 @@ # encoding: utf-8 import sys -from .. import util class JRNLImporter: @@ -15,7 +14,6 @@ class JRNLImporter: """Imports from an existing file if input is specified, and standard input otherwise.""" old_cnt = len(journal.entries) - old_entries = journal.entries if input: with open(input, "r", encoding="utf-8") as f: other_journal_txt = f.read() diff --git a/jrnl/plugins/markdown_exporter.py b/jrnl/plugins/markdown_exporter.py index 14060ce9..08527ae4 100644 --- a/jrnl/plugins/markdown_exporter.py +++ b/jrnl/plugins/markdown_exporter.py @@ -2,7 +2,6 @@ # encoding: utf-8 from .text_exporter import TextExporter -import os import re import sys from ..util import WARNING_COLOR, RESET_COLOR diff --git a/jrnl/plugins/template.py b/jrnl/plugins/template.py index ccb02442..c7b72772 100644 --- a/jrnl/plugins/template.py +++ b/jrnl/plugins/template.py @@ -6,9 +6,7 @@ EXPRESSION_RE = r"[\[\]():.a-zA-Z0-9_]*" PRINT_RE = r"{{ *(.+?) *}}" START_BLOCK_RE = r"{% *(if|for) +(.+?) *%}" END_BLOCK_RE = r"{% *end(for|if) *%}" -FOR_RE = r"{{% *for +({varname}) +in +([^%]+) *%}}".format( - varname=VAR_RE, expression=EXPRESSION_RE -) +FOR_RE = r"{{% *for +({varname}) +in +([^%]+) *%}}".format(varname=VAR_RE) IF_RE = r"{% *if +(.+?) *%}" BLOCK_RE = r"{% *block +(.+?) *%}((?:.|\n)+?){% *endblock *%}" INCLUDE_RE = r"{% *include +(.+?) *%}" diff --git a/jrnl/plugins/yaml_exporter.py b/jrnl/plugins/yaml_exporter.py index 6a550b0c..911e607c 100644 --- a/jrnl/plugins/yaml_exporter.py +++ b/jrnl/plugins/yaml_exporter.py @@ -2,7 +2,6 @@ # encoding: utf-8 from .text_exporter import TextExporter -import os import re import sys from ..util import WARNING_COLOR, ERROR_COLOR, RESET_COLOR @@ -19,10 +18,9 @@ class YAMLExporter(TextExporter): """Returns a markdown representation of a single entry, with YAML front matter.""" if to_multifile is False: print( - "{}ERROR{}: YAML export must be to individual files. Please \ - specify a directory to export to.".format( - ERROR_COLOR, RESET_COLOR, file=sys.stderr - ) + f"{ERROR_COLOR}ERROR{RESET_COLOR}: YAML export must be to individual files. Please \ + specify a directory to export to.", + file=sys.stderr, ) return