diff options
| author | Jay Kamat <jaygkamat@gmail.com> | 2019-07-04 18:50:30 -0700 |
|---|---|---|
| committer | Jay Kamat <jaygkamat@gmail.com> | 2019-07-04 18:50:30 -0700 |
| commit | 8cfbf80934b6b6ef1b3fde48195b01d084cadc68 (patch) | |
| tree | deaf60d116c00fc73d9a153fd8acb0ad660d7212 | |
| parent | 76c3de4b8479e309f0d899ba163eb2d09df2b15a (diff) | |
| download | qutebrowser-8cfbf80934b6b6ef1b3fde48195b01d084cadc68.tar.gz qutebrowser-8cfbf80934b6b6ef1b3fde48195b01d084cadc68.zip | |
Fix style issues
| -rw-r--r-- | qutebrowser/qutebrowser.py | 2 | ||||
| -rw-r--r-- | qutebrowser/utils/standarddir.py | 4 | ||||
| -rw-r--r-- | tests/helpers/fixtures.py | 4 | ||||
| -rw-r--r-- | tests/unit/config/test_configcommands.py | 1 | ||||
| -rw-r--r-- | tests/unit/utils/test_standarddir.py | 4 |
5 files changed, 7 insertions, 8 deletions
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py index fe846d489..cde9de52f 100644 --- a/qutebrowser/qutebrowser.py +++ b/qutebrowser/qutebrowser.py @@ -62,7 +62,7 @@ def get_argparser(): description=qutebrowser.__description__) parser.add_argument('-B', '--basedir', help="Base directory for all " "storage.") - parser.add_argument('-C', '--config-py', help="Path to config.py") + parser.add_argument('-C', '--config-py', help="Path to config.py.") parser.add_argument('-V', '--version', help="Show version and quit.", action='store_true') parser.add_argument('-s', '--set', help="Set a temporary setting for " diff --git a/qutebrowser/utils/standarddir.py b/qutebrowser/utils/standarddir.py index 0e5c7ea0a..186a42ae3 100644 --- a/qutebrowser/utils/standarddir.py +++ b/qutebrowser/utils/standarddir.py @@ -117,8 +117,8 @@ def config(auto=False): def config_py() -> str: """Get the location for config.py. - hard-coding config.py in the config dir is not reliable, as config.py may - be overridden. + Usually, config.py is in standarddir.config(), but this can be overridden + with the --config-py argument. """ return _locations[_Location.config_py] diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py index ad9de10db..d752456e6 100644 --- a/tests/helpers/fixtures.py +++ b/tests/helpers/fixtures.py @@ -553,8 +553,8 @@ def config_tmpdir(monkeypatch, tmpdir): @pytest.fixture def config_py_arg(tmpdir, monkeypatch): - """Arguments needed for the config to init.""" - f = tmpdir.join('temp_config.py') + """Set the config_py arg with a custom value for init.""" + f = tmpdir / 'temp_config.py' monkeypatch.setattr( standarddir, 'config_py', lambda **_kwargs: str(f)) diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py index f11410622..9a31c622e 100644 --- a/tests/unit/config/test_configcommands.py +++ b/tests/unit/config/test_configcommands.py @@ -495,7 +495,6 @@ class TestSource: def test_config_py_arg_source(self, commands, config_py_arg, config_stub): assert config_stub.val.content.javascript.enabled - config_stub.val.search.ignore_case = 'always' config_py_arg.write_text('c.content.javascript.enabled = False\n', encoding='utf-8') commands.config_source() diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py index 4ac4944f0..82f58653a 100644 --- a/tests/unit/utils/test_standarddir.py +++ b/tests/unit/utils/test_standarddir.py @@ -254,7 +254,7 @@ class TestArguments: assert standarddir.config() == str(basedir / 'config') def test_config_py_arg(self, tmpdir): - basedir = (tmpdir / 'basedir') + basedir = tmpdir / 'basedir' basedir.ensure(dir=True) with tmpdir.as_cwd(): args = types.SimpleNamespace( @@ -263,7 +263,7 @@ class TestArguments: assert standarddir.config_py() == str(basedir / 'config.py') def test_config_py_no_arg(self, tmpdir): - basedir = (tmpdir / 'basedir') + basedir = tmpdir / 'basedir' basedir.ensure(dir=True) with tmpdir.as_cwd(): args = types.SimpleNamespace(basedir='basedir') |