fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

run format

Browse source
This commit is contained in:
Jonathan Wren 2023-03-04 14:21:07 -08:00
parent 9bca32b438
commit e6a36a9c0a
No known key found for this signature in database
7 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
jrnl/config.py
View file

@ -34,7 +34,6 @@ YAML_FILE_ENCODING = "utf-8"
def make_yaml_valid_dict(input: list) -> dict: def make_yaml_valid_dict(input: list) -> dict:
""" """
Convert a two-element list of configuration key-value pair into a flat dict. Convert a two-element list of configuration key-value pair into a flat dict.

3
jrnl/journals/Journal.py
View file

@ -343,7 +343,8 @@ class Journal:
def new_entry(self, raw: str, date=None, sort: bool = True) -> Entry: def new_entry(self, raw: str, date=None, sort: bool = True) -> Entry:
"""Constructs a new entry from some raw text input. """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") raw = raw.replace("\\n ", "\n").replace("\\n", "\n")
# Split raw text into title and body # Split raw text into title and body

2
jrnl/override.py
View file

@ -9,6 +9,7 @@ from jrnl.config import update_config
if TYPE_CHECKING: if TYPE_CHECKING:
from argparse import Namespace from argparse import Namespace
# import logging # import logging
def apply_overrides(args: "Namespace", base_config: dict) -> dict: def apply_overrides(args: "Namespace", base_config: dict) -> dict:
"""Unpack CLI provided overrides into the configuration tree. """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() cfg_with_overrides = base_config.copy()
for pairs in overrides: for pairs in overrides:
pairs = make_yaml_valid_dict(pairs) pairs = make_yaml_valid_dict(pairs)
key_as_dots, override_value = _get_key_and_value_from_pair(pairs) key_as_dots, override_value = _get_key_and_value_from_pair(pairs)
keys = _convert_dots_to_list(key_as_dots) keys = _convert_dots_to_list(key_as_dots)

6
tests/bdd/features/action-combinations.feature
View file

@ -28,7 +28,7 @@ Feature: Test combinations of edit, change-time, and delete
Scenario Outline: --delete with --edit deletes selected entries Scenario Outline: --delete with --edit deletes selected entries
Given we use the config "<config_file>" Given we use the config "<config_file>"
And we append to the editor if opened 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 And we use the password "test" if prompted
When we run "jrnl --delete --edit" and enter When we run "jrnl --delete --edit" and enter
Y Y
@ -36,14 +36,14 @@ Feature: Test combinations of edit, change-time, and delete
Y Y
Then the editor should have been called Then the editor should have been called
And the error output should contain "3 entries found" 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" And the error output should contain "1 entry added"
When we run "jrnl -99 --short" When we run "jrnl -99 --short"
Then the error output should contain "2 entries found" Then the error output should contain "2 entries found"
And the output should be And the output should be
2020-08-31 14:32 A second entry in what I hope to be a long series. 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 2023-02-21 10:32 Here is a new entry
Examples: Configs Examples: Configs
| config_file | | config_file |
| basic_onefile.yaml | | basic_onefile.yaml |

1
tests/unit/test_export.py
View file

@ -26,7 +26,6 @@ def build_card_header(datestr):
class TestFancy: class TestFancy:
def test_too_small_linewrap(self, datestr): def test_too_small_linewrap(self, datestr):
journal = "test_journal" journal = "test_journal"
content = build_card_header(datestr) content = build_card_header(datestr)

1
tests/unit/test_override.py
View file

@ -101,7 +101,6 @@ def test_get_kv_from_pair():
class TestDotNotationToList: class TestDotNotationToList:
def test_unpack_dots_to_list(self): def test_unpack_dots_to_list(self):
keys = "a.b.c.d.e.f" keys = "a.b.c.d.e.f"
keys_list = _convert_dots_to_list(keys) keys_list = _convert_dots_to_list(keys)
assert len(keys_list) == 6 assert len(keys_list) == 6

2
tests/unit/test_parse_args.py
View file

@ -229,7 +229,6 @@ def test_version_alone():
def test_editor_override(): def test_editor_override():
parsed_args = cli_as_dict('--config-override editor "nano"') parsed_args = cli_as_dict('--config-override editor "nano"')
assert parsed_args == expected_args(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): def test_deserialize_multiword_strings(self, input_str):
runtime_config = make_yaml_valid_dict(input_str) runtime_config = make_yaml_valid_dict(input_str)
assert runtime_config.__class__ == dict assert runtime_config.__class__ == dict
assert input_str[0] in runtime_config assert input_str[0] in runtime_config