aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/dump.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-07-13 22:57:31 +1200
committerGitHub <noreply@github.com>2016-07-13 22:57:31 +1200
commitefc0b9fe7f8420abb03bbfce9316afee9cfa4c5c (patch)
tree59e17892e13a20c051512dfd2bd6a5af5d30ca03 /mitmproxy/dump.py
parent2624911d75670afaff8631943d567bfa2b42d7b8 (diff)
parent077850bd107d7ffe1cf3d4a8667bb04ea47beb96 (diff)
downloadmitmproxy-efc0b9fe7f8420abb03bbfce9316afee9cfa4c5c.tar.gz
mitmproxy-efc0b9fe7f8420abb03bbfce9316afee9cfa4c5c.tar.bz2
mitmproxy-efc0b9fe7f8420abb03bbfce9316afee9cfa4c5c.zip
Merge pull request #1347 from cortesi/options
Options
Diffstat (limited to 'mitmproxy/dump.py')
-rw-r--r--mitmproxy/dump.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py
index 10465b63..bfefb319 100644
--- a/mitmproxy/dump.py
+++ b/mitmproxy/dump.py
@@ -11,6 +11,7 @@ from mitmproxy import controller
from mitmproxy import exceptions
from mitmproxy import filt
from mitmproxy import flow
+from mitmproxy import options
from netlib import human
from netlib import tcp
from netlib import strutils
@@ -20,7 +21,7 @@ class DumpError(Exception):
pass
-class Options(object):
+class Options(options.Options):
attributes = [
"app",
"app_host",
@@ -53,13 +54,6 @@ class Options(object):
"replay_ignore_host"
]
- def __init__(self, **kwargs):
- for k, v in kwargs.items():
- setattr(self, k, v)
- for i in self.attributes:
- if not hasattr(self, i):
- setattr(self, i, None)
-
class DumpMaster(flow.FlowMaster):