summaryrefslogtreecommitdiff
path: root/qutebrowser/qutebrowser.py
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-02-03 19:19:47 +0100
committerFlorian Bruhin <me@the-compiler.org>2021-02-03 19:19:47 +0100
commit44042358f722775648e7f0ff361aa4dfbe7517d7 (patch)
treee63c7f015b2d1682111891305c121ec6c003764d /qutebrowser/qutebrowser.py
parente7cafd34cc79df759f2ad9a13a7dc6f84e923f0b (diff)
downloadqutebrowser-44042358f722775648e7f0ff361aa4dfbe7517d7.tar.gz
qutebrowser-44042358f722775648e7f0ff361aa4dfbe7517d7.zip
Allow providing a subset of args with --json-args
See #6091
Diffstat (limited to 'qutebrowser/qutebrowser.py')
-rw-r--r--qutebrowser/qutebrowser.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index fe8d824ec..135fdbe1b 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -190,8 +190,10 @@ def _unpack_json_args(args):
construct a "fake" argparse.Namespace here based on the data loaded
from json.
"""
+ new_args = vars(args)
data = json.loads(args.json_args)
- return argparse.Namespace(**data)
+ new_args.update(data)
+ return argparse.Namespace(**new_args)
def main():