diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2019-07-17 23:59:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 23:59:40 +0200 |
| commit | 2e30c4073dd8b6ee3724a2aabe9b5460f9427baf (patch) | |
| tree | a48540b9748d03ca4bd800b75159bf1f573fca2d | |
| parent | d64ec3072d04d9303e1ca6a9d6b7b76f233c15c6 (diff) | |
| parent | 13ad81eaff35eef8e24a345bb665caf4fab77e43 (diff) | |
| download | mitmproxy-2e30c4073dd8b6ee3724a2aabe9b5460f9427baf.tar.gz mitmproxy-2e30c4073dd8b6ee3724a2aabe9b5460f9427baf.tar.bz2 mitmproxy-2e30c4073dd8b6ee3724a2aabe9b5460f9427baf.zip | |
Merge pull request #3516 from pierlon/remove-confdir-argument
Remove the confdir argument
| -rw-r--r-- | mitmproxy/tools/_main.py | 3 | ||||
| -rw-r--r-- | mitmproxy/tools/cmdline.py | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/mitmproxy/tools/_main.py b/mitmproxy/tools/_main.py index f1c763b2..b95d73ab 100644 --- a/mitmproxy/tools/_main.py +++ b/mitmproxy/tools/_main.py @@ -87,7 +87,7 @@ def run( arg_check.check() sys.exit(1) try: - opts.confdir = args.confdir + opts.set(*args.setoptions, defer=True) optmanager.load_paths( opts, os.path.join(opts.confdir, OPTIONS_FILE_NAME), @@ -110,7 +110,6 @@ def run( if args.commands: master.commands.dump() sys.exit(0) - opts.set(*args.setoptions, defer=True) if extra: opts.update(**extra(args)) diff --git a/mitmproxy/tools/cmdline.py b/mitmproxy/tools/cmdline.py index ad934ca2..a7820f76 100644 --- a/mitmproxy/tools/cmdline.py +++ b/mitmproxy/tools/cmdline.py @@ -21,12 +21,6 @@ def common_options(parser, opts): help="Show all commands and their signatures", ) parser.add_argument( - "--confdir", - type=str, dest="confdir", default=core.CONF_DIR, - metavar="PATH", - help="Path to the mitmproxy config directory" - ) - parser.add_argument( "--set", type=str, dest="setoptions", default=[], action="append", |