From c4b3d511818bcd11421d4a41d041b364bea79229 Mon Sep 17 00:00:00 2001 From: Suhas Date: Wed, 20 Jan 2021 21:35:26 -0500 Subject: [PATCH] make format --- jrnl/args.py | 7 +++++-- jrnl/jrnl.py | 6 +++--- tests/test_config.py | 28 +++++++++++++++++----------- tests/test_parse_args.py | 8 ++++++-- 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/jrnl/args.py b/jrnl/args.py index cab41001..761007a3 100644 --- a/jrnl/args.py +++ b/jrnl/args.py @@ -316,7 +316,10 @@ def parse_args(args=[]): help=argparse.SUPPRESS, ) - overrides = parser.add_argument_group("Config file overrides",textwrap.dedent('These are one-off overrides of the config file options')) + overrides = parser.add_argument_group( + "Config file overrides", + textwrap.dedent("These are one-off overrides of the config file options"), + ) overrides.add_argument( "--override", dest="config_override", @@ -331,7 +334,7 @@ def parse_args(args=[]): For example, to use a different editor for this jrnl entry, call: jrnl --override '{"editor": "nano"}' - """ + """, ) # Handle '-123' as a shortcut for '-n 123' diff --git a/jrnl/jrnl.py b/jrnl/jrnl.py index 3f3216f8..e58cc956 100644 --- a/jrnl/jrnl.py +++ b/jrnl/jrnl.py @@ -51,9 +51,9 @@ def run(args): # Apply config overrides overrides = args.config_override - #TODO: substitute overriden KV pairs in config dict ONLY AFTER ADDING TESTS - for k in overrides: - logging.debug("Overriding %s from %s to %s"%(k,config[k],overrides[k])) + # TODO: substitute overriden KV pairs in config dict ONLY AFTER ADDING TESTS + for k in overrides: + logging.debug("Overriding %s from %s to %s" % (k, config[k], overrides[k])) config[k] = overrides[k] # --- All the standalone commands are now done --- # diff --git a/tests/test_config.py b/tests/test_config.py index af0bc784..083f3fe6 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1,25 +1,31 @@ -import pytest -import pytest_mock +import pytest +import pytest_mock import mock import yaml from jrnl.args import parse_args -from jrnl.jrnl import run -from jrnl import install +from jrnl.jrnl import run +from jrnl import install + @pytest.fixture() def minimal_config(): - with open('features/data/configs/editor.yaml','r') as cfg_file: + with open("features/data/configs/editor.yaml", "r") as cfg_file: yield yaml.load(cfg_file.read()) + from jrnl import jrnl -@mock.patch.object(jrnl,'write_mode') -@mock.patch.object(install,'load_or_install_jrnl') -def test_override_configured_editor(mock_load_or_install, mock_write_mode, minimal_config): + + +@mock.patch.object(jrnl, "write_mode") +@mock.patch.object(install, "load_or_install_jrnl") +def test_override_configured_editor( + mock_load_or_install, mock_write_mode, minimal_config +): mock_load_or_install.return_value = minimal_config - cli_args = ['--override','{\"editor\": \"nano\"}' ] + cli_args = ["--override", '{"editor": "nano"}'] parser = parse_args(cli_args) assert parser.config_override.__len__() == 1 - with mock.patch('subprocess.call'): + with mock.patch("subprocess.call"): res = run(parser) - assert res==None \ No newline at end of file + assert res == None diff --git a/tests/test_parse_args.py b/tests/test_parse_args.py index b0de80a3..ee67ba65 100644 --- a/tests/test_parse_args.py +++ b/tests/test_parse_args.py @@ -35,7 +35,7 @@ def expected_args(**kwargs): "strict": False, "tags": False, "text": [], - "config_override":{} + "config_override": {}, } return {**default_args, **kwargs} @@ -205,9 +205,13 @@ def test_version_alone(): assert cli_as_dict("--version") == expected_args(preconfig_cmd=preconfig_version) + def test_editor_override(): - assert cli_as_dict("--override '{\"editor\": \"nano\"}'") == expected_args(config_override={'editor':'nano'}) + assert cli_as_dict('--override \'{"editor": "nano"}\'') == expected_args( + config_override={"editor": "nano"} + ) + # @see https://github.com/jrnl-org/jrnl/issues/520 @pytest.mark.parametrize(