diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-06-16 00:41:43 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-06-16 00:41:43 +0200 |
| commit | fd36142018a18f0d6c996e9c07bfc7e80e20afc4 (patch) | |
| tree | 6a42399d1150a6196c71c7fb7bd80b0dc6fbf58b /libmproxy/dump.py | |
| parent | 34f286df511d0d6987a21e105a7cde651130fa2d (diff) | |
| parent | b4f6f09c83faf54c4c1493e18ba11d0257ca841b (diff) | |
| download | mitmproxy-fd36142018a18f0d6c996e9c07bfc7e80e20afc4.tar.gz mitmproxy-fd36142018a18f0d6c996e9c07bfc7e80e20afc4.tar.bz2 mitmproxy-fd36142018a18f0d6c996e9c07bfc7e80e20afc4.zip | |
Merge remote-tracking branch 'origin/scripts_improvements' into 0.10
Diffstat (limited to 'libmproxy/dump.py')
| -rw-r--r-- | libmproxy/dump.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 06c15c63..cfc7c5da 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -36,7 +36,7 @@ class Options(object): "rheaders", "setheaders", "server_replay", - "script", + "scripts", "showhost", "stickycookie", "stickyauth", @@ -121,8 +121,8 @@ class DumpMaster(flow.FlowMaster): not options.keepserving ) - if options.script: - err = self.load_script(options.script) + for script_argv in options.scripts: + err = self.load_script(script_argv) if err: raise DumpError(err) @@ -230,8 +230,8 @@ class DumpMaster(flow.FlowMaster): def run(self): # pragma: no cover if self.o.rfile and not self.o.keepserving: - if self.script: - self.load_script(None) + for script in self.scripts: + self.unload_script(script) return try: return flow.FlowMaster.run(self) |