aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/dump.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-07-20 11:46:24 +1200
committerGitHub <noreply@github.com>2016-07-20 11:46:24 +1200
commit1ff800598a9edf56c6e7eafda0e9558ab6a88489 (patch)
treea2aa4f84facb7af17a91a948b7f30074fb64c655 /mitmproxy/dump.py
parentaa3b866e1d82b7a08d497695eb0fa2c1ddd2c2cf (diff)
parent8317772377baa5eaa9c4d05014f952337f4d03cd (diff)
downloadmitmproxy-1ff800598a9edf56c6e7eafda0e9558ab6a88489.tar.gz
mitmproxy-1ff800598a9edf56c6e7eafda0e9558ab6a88489.tar.bz2
mitmproxy-1ff800598a9edf56c6e7eafda0e9558ab6a88489.zip
Merge pull request #1383 from cortesi/options
mitmproxy.flow.options -> mitmproxy.options
Diffstat (limited to 'mitmproxy/dump.py')
-rw-r--r--mitmproxy/dump.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py
index 78dd2578..4f34ab95 100644
--- a/mitmproxy/dump.py
+++ b/mitmproxy/dump.py
@@ -12,6 +12,7 @@ from mitmproxy import exceptions
from mitmproxy import flow
from mitmproxy import builtins
from mitmproxy import utils
+from mitmproxy import options
from mitmproxy.builtins import dumper
from netlib import tcp
@@ -20,7 +21,7 @@ class DumpError(Exception):
pass
-class Options(flow.options.Options):
+class Options(options.Options):
def __init__(
self,
keepserving=False, # type: bool