diff --git a/jrnl/config.py b/jrnl/config.py index bc10b86b..f31dc77d 100644 --- a/jrnl/config.py +++ b/jrnl/config.py @@ -34,7 +34,6 @@ YAML_FILE_ENCODING = "utf-8" def make_yaml_valid_dict(input: list) -> dict: - """ Convert a two-element list of configuration key-value pair into a flat dict. diff --git a/jrnl/journals/Journal.py b/jrnl/journals/Journal.py index a666e7b8..bd72788b 100644 --- a/jrnl/journals/Journal.py +++ b/jrnl/journals/Journal.py @@ -343,7 +343,8 @@ class Journal: def new_entry(self, raw: str, date=None, sort: bool = True) -> Entry: """Constructs a new entry from some raw text input. - If a date is given, it will parse and use this, otherwise scan for a date in the input first.""" + If a date is given, it will parse and use this, otherwise scan for a date in the input first. + """ raw = raw.replace("\\n ", "\n").replace("\\n", "\n") # Split raw text into title and body diff --git a/jrnl/override.py b/jrnl/override.py index 695bcf4a..64a0fe86 100644 --- a/jrnl/override.py +++ b/jrnl/override.py @@ -9,6 +9,7 @@ from jrnl.config import update_config if TYPE_CHECKING: from argparse import Namespace + # import logging def apply_overrides(args: "Namespace", base_config: dict) -> dict: """Unpack CLI provided overrides into the configuration tree. @@ -26,7 +27,6 @@ def apply_overrides(args: "Namespace", base_config: dict) -> dict: cfg_with_overrides = base_config.copy() for pairs in overrides: - pairs = make_yaml_valid_dict(pairs) key_as_dots, override_value = _get_key_and_value_from_pair(pairs) keys = _convert_dots_to_list(key_as_dots) diff --git a/tests/bdd/features/action-combinations.feature b/tests/bdd/features/action-combinations.feature index f7a06851..cee7dac0 100644 --- a/tests/bdd/features/action-combinations.feature +++ b/tests/bdd/features/action-combinations.feature @@ -28,7 +28,7 @@ Feature: Test combinations of edit, change-time, and delete Scenario Outline: --delete with --edit deletes selected entries Given we use the config "" And we append to the editor if opened - [2023-02-21 10:32] Here is a new entry + [2023-02-21 10:32] Here is a new entry And we use the password "test" if prompted When we run "jrnl --delete --edit" and enter Y @@ -36,14 +36,14 @@ Feature: Test combinations of edit, change-time, and delete Y Then the editor should have been called And the error output should contain "3 entries found" - And the error output should contain "2 entries deleted" + And the error output should contain "2 entries deleted" And the error output should contain "1 entry added" When we run "jrnl -99 --short" Then the error output should contain "2 entries found" And the output should be 2020-08-31 14:32 A second entry in what I hope to be a long series. 2023-02-21 10:32 Here is a new entry - + Examples: Configs | config_file | | basic_onefile.yaml | diff --git a/tests/unit/test_export.py b/tests/unit/test_export.py index fb53aa33..10e9dd6b 100644 --- a/tests/unit/test_export.py +++ b/tests/unit/test_export.py @@ -26,7 +26,6 @@ def build_card_header(datestr): class TestFancy: def test_too_small_linewrap(self, datestr): - journal = "test_journal" content = build_card_header(datestr) diff --git a/tests/unit/test_override.py b/tests/unit/test_override.py index bbbdd381..25fd085d 100644 --- a/tests/unit/test_override.py +++ b/tests/unit/test_override.py @@ -101,7 +101,6 @@ def test_get_kv_from_pair(): class TestDotNotationToList: def test_unpack_dots_to_list(self): - keys = "a.b.c.d.e.f" keys_list = _convert_dots_to_list(keys) assert len(keys_list) == 6 diff --git a/tests/unit/test_parse_args.py b/tests/unit/test_parse_args.py index 0b266d23..89c4edcf 100644 --- a/tests/unit/test_parse_args.py +++ b/tests/unit/test_parse_args.py @@ -229,7 +229,6 @@ def test_version_alone(): def test_editor_override(): - parsed_args = cli_as_dict('--config-override editor "nano"') assert parsed_args == expected_args(config_override=[["editor", "nano"]]) @@ -293,7 +292,6 @@ class TestDeserialization: ], ) def test_deserialize_multiword_strings(self, input_str): - runtime_config = make_yaml_valid_dict(input_str) assert runtime_config.__class__ == dict assert input_str[0] in runtime_config