aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/dump.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-10-19 15:03:50 +1300
committerGitHub <noreply@github.com>2016-10-19 15:03:50 +1300
commit49346c5248b8aa33acef26f0d55f51dcd2493a59 (patch)
treee92c9ac66a83fed5cf964691e5b0e81b90fc1eea /mitmproxy/dump.py
parent83dbefb224c0b0d77b226f80e37b5b3d6bebb703 (diff)
parent7c32d4ea2a435484e83aa459831f74ca483d8e3c (diff)
downloadmitmproxy-49346c5248b8aa33acef26f0d55f51dcd2493a59.tar.gz
mitmproxy-49346c5248b8aa33acef26f0d55f51dcd2493a59.tar.bz2
mitmproxy-49346c5248b8aa33acef26f0d55f51dcd2493a59.zip
Merge pull request #1632 from cortesi/refactor
Start rationalising our module structure bit by bit
Diffstat (limited to 'mitmproxy/dump.py')
-rw-r--r--mitmproxy/dump.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py
index 4731686c..e8b3126f 100644
--- a/mitmproxy/dump.py
+++ b/mitmproxy/dump.py
@@ -4,10 +4,10 @@ from typing import Optional
from mitmproxy import controller
from mitmproxy import exceptions
from mitmproxy import flow
-from mitmproxy import builtins
+from mitmproxy import addons
from mitmproxy import options
from mitmproxy import master
-from mitmproxy.builtins import dumper, termlog
+from mitmproxy.addons import dumper, termlog
from netlib import tcp
@@ -37,7 +37,7 @@ class DumpMaster(master.Master):
master.Master.__init__(self, options, server)
self.has_errored = False
self.addons.add(termlog.TermLog())
- self.addons.add(*builtins.default_addons())
+ self.addons.add(*addons.default_addons())
self.addons.add(dumper.Dumper())
# This line is just for type hinting
self.options = self.options # type: Options