aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/tools
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2017-04-26 11:23:48 +1200
committerGitHub <noreply@github.com>2017-04-26 11:23:48 +1200
commit1daf0b3f0ae80e1e2dce823204547611e28d6ee9 (patch)
tree57b4153fa4980e2af1aff7aae9c84ae507a463fb /mitmproxy/tools
parent02c82b1b602b7d5ab03c1e25d7d89f44c593174a (diff)
parentb72f1390937e9799f588fd9a1564056131fb1aa7 (diff)
downloadmitmproxy-1daf0b3f0ae80e1e2dce823204547611e28d6ee9.tar.gz
mitmproxy-1daf0b3f0ae80e1e2dce823204547611e28d6ee9.tar.bz2
mitmproxy-1daf0b3f0ae80e1e2dce823204547611e28d6ee9.zip
Merge pull request #2264 from cortesi/options
Change the way addons handle options
Diffstat (limited to 'mitmproxy/tools')
-rw-r--r--mitmproxy/tools/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mitmproxy/tools/main.py b/mitmproxy/tools/main.py
index de9032c8..c0326739 100644
--- a/mitmproxy/tools/main.py
+++ b/mitmproxy/tools/main.py
@@ -76,7 +76,7 @@ def run(MasterKlass, args, extra=None): # pragma: no cover
unknown = optmanager.load_paths(opts, args.conf)
server = process_options(parser, opts, args)
master = MasterKlass(opts, server)
- master.addons.trigger("configure", opts, opts.keys())
+ master.addons.trigger("configure", opts.keys())
remaining = opts.update_known(**unknown)
if remaining and opts.verbosity > 1:
print("Ignored options: %s" % remaining)