fix various small issues in the codebase

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]

jrnl/EncryptedJournal.py

@@ -10,7 +10,6 @@ import sys
 import os
 import base64
 import logging
-from typing import Optional
 
 
 log = logging.getLogger()

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

jrnl/__init__.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-import os
-
 try:
     from .__version__ import __version__
 except ImportError:

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

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

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()

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

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(
+FOR_RE = r"{{% *for +({varname}) +in +([^%]+) *%}}".format(varname=VAR_RE)
-    varname=VAR_RE, expression=EXPRESSION_RE
-)
 IF_RE = r"{% *if +(.+?) *%}"
 BLOCK_RE = r"{% *block +(.+?) *%}((?:.|\n)+?){% *endblock *%}"
 INCLUDE_RE = r"{% *include +(.+?) *%}"

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 \
+                f"{ERROR_COLOR}ERROR{RESET_COLOR}: YAML export must be to individual files. Please \
-                specify a directory to export to.".format(
+                specify a directory to export to.",
-                    ERROR_COLOR, RESET_COLOR, file=sys.stderr
+                file=sys.stderr,
-                )
             )
             return