aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/dump.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-07-15 16:48:01 +1200
committerGitHub <noreply@github.com>2016-07-15 16:48:01 +1200
commit64e16f5112669a31f86183be640eeee3a47c2961 (patch)
tree2e8ecc38f022c2b302d5ce67fd282dab45941fd9 /mitmproxy/dump.py
parente051928f26afbc58c01d7854b62f8bfb0d4ed5ee (diff)
parentc7d0850d8f697915b183f4fafd5ede7df2245569 (diff)
downloadmitmproxy-64e16f5112669a31f86183be640eeee3a47c2961.tar.gz
mitmproxy-64e16f5112669a31f86183be640eeee3a47c2961.tar.bz2
mitmproxy-64e16f5112669a31f86183be640eeee3a47c2961.zip
Merge pull request #1356 from cortesi/script
Scripts to addon
Diffstat (limited to 'mitmproxy/dump.py')
-rw-r--r--mitmproxy/dump.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py
index 274e01f3..999a709a 100644
--- a/mitmproxy/dump.py
+++ b/mitmproxy/dump.py
@@ -93,13 +93,6 @@ class DumpMaster(flow.FlowMaster):
not options.keepserving
)
- scripts = options.scripts or []
- for command in scripts:
- try:
- self.load_script(command, use_reloader=True)
- except exceptions.ScriptException as e:
- raise DumpError(str(e))
-
if options.rfile:
try:
self.load_flows_file(options.rfile)
@@ -335,6 +328,5 @@ class DumpMaster(flow.FlowMaster):
def run(self): # pragma: no cover
if self.options.rfile and not self.options.keepserving:
- self.unload_scripts() # make sure to trigger script unload events.
return
super(DumpMaster, self).run()