diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-09-24 18:21:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-24 18:21:12 -0700 |
| commit | 0a643ad20fa45c2fbd8a9de16aa7d632bd89d190 (patch) | |
| tree | 13f1880af20c9144afa4edbb215a3771b6b246d8 /mitmproxy | |
| parent | 92dd030c22a48f8e65638e8cbac633318f203132 (diff) | |
| download | mitmproxy-0a643ad20fa45c2fbd8a9de16aa7d632bd89d190.tar.gz mitmproxy-0a643ad20fa45c2fbd8a9de16aa7d632bd89d190.tar.bz2 mitmproxy-0a643ad20fa45c2fbd8a9de16aa7d632bd89d190.zip | |
remove option argument for addons.add (#1576)
Diffstat (limited to 'mitmproxy')
| -rw-r--r-- | mitmproxy/addons.py | 6 | ||||
| -rw-r--r-- | mitmproxy/builtins/script.py | 2 | ||||
| -rw-r--r-- | mitmproxy/console/master.py | 2 | ||||
| -rw-r--r-- | mitmproxy/dump.py | 4 | ||||
| -rw-r--r-- | mitmproxy/web/master.py | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/mitmproxy/addons.py b/mitmproxy/addons.py index 2658c0af..db126dd9 100644 --- a/mitmproxy/addons.py +++ b/mitmproxy/addons.py @@ -11,7 +11,7 @@ class Addons(object): def __init__(self, master): self.chain = [] self.master = master - master.options.changed.connect(self.options_update) + master.options.changed.connect(self._options_update) def get(self, name): """ @@ -23,12 +23,12 @@ class Addons(object): if name == _get_name(i): return i - def options_update(self, options, updated): + def _options_update(self, options, updated): for i in self.chain: with self.master.handlecontext(): i.configure(options, updated) - def add(self, options, *addons): + def add(self, *addons): if not addons: raise ValueError("No addons specified.") self.chain.extend(addons) diff --git a/mitmproxy/builtins/script.py b/mitmproxy/builtins/script.py index ba62d416..bbefc5c7 100644 --- a/mitmproxy/builtins/script.py +++ b/mitmproxy/builtins/script.py @@ -249,4 +249,4 @@ class ScriptLoader(): else: ctx.log.info("Loading script: %s" % s) sc = Script(s) - ctx.master.addons.add(options, sc) + ctx.master.addons.add(sc) diff --git a/mitmproxy/console/master.py b/mitmproxy/console/master.py index 8ded1ea1..febf46c5 100644 --- a/mitmproxy/console/master.py +++ b/mitmproxy/console/master.py @@ -256,7 +256,7 @@ class ConsoleMaster(flow.FlowMaster): signals.replace_view_state.connect(self.sig_replace_view_state) signals.push_view_state.connect(self.sig_push_view_state) signals.sig_add_log.connect(self.sig_add_log) - self.addons.add(options, *builtins.default_addons()) + self.addons.add(*builtins.default_addons()) def __setattr__(self, name, value): self.__dict__[name] = value diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py index 778968b9..e894dd36 100644 --- a/mitmproxy/dump.py +++ b/mitmproxy/dump.py @@ -42,8 +42,8 @@ class DumpMaster(flow.FlowMaster): def __init__(self, server, options): flow.FlowMaster.__init__(self, options, server, flow.State()) self.has_errored = False - self.addons.add(options, *builtins.default_addons()) - self.addons.add(options, dumper.Dumper()) + self.addons.add(*builtins.default_addons()) + self.addons.add(dumper.Dumper()) # This line is just for type hinting self.options = self.options # type: Options self.set_stream_large_bodies(options.stream_large_bodies) diff --git a/mitmproxy/web/master.py b/mitmproxy/web/master.py index 5751c9dd..8ea9065b 100644 --- a/mitmproxy/web/master.py +++ b/mitmproxy/web/master.py @@ -136,7 +136,7 @@ class WebMaster(flow.FlowMaster): def __init__(self, server, options): super(WebMaster, self).__init__(options, server, WebState()) - self.addons.add(options, *builtins.default_addons()) + self.addons.add(*builtins.default_addons()) self.app = app.Application( self, self.options.wdebug, self.options.wauthenticator ) |