More powerful Options scheme

This prepares us for the addon configuration mechanism and gives us a more
flexible way to handle options changes. This changeset should spell the end of
the current anti-pattern in our codebase where we duplicate data out of options
onto the master when mutability is needed. From now on, Options can be the one
source of thruth.

- Change notifications
- Rollback on error

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):