aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2013-03-03 12:26:20 +1300
committerAldo Cortesi <aldo@nullcube.com>2013-03-03 12:26:20 +1300
commite608d10f455550b8afd09217f0ecf344a0bdc814 (patch)
tree7642a59ace385c8aefc2c306b105567ff0333959 /libmproxy
parent75b5c970950f11249353ee10931305cfc1c21400 (diff)
downloadmitmproxy-e608d10f455550b8afd09217f0ecf344a0bdc814.tar.gz
mitmproxy-e608d10f455550b8afd09217f0ecf344a0bdc814.tar.bz2
mitmproxy-e608d10f455550b8afd09217f0ecf344a0bdc814.zip
Remove __slots__ to make it possible to inherit from Options classes.
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/console/__init__.py4
-rw-r--r--libmproxy/dump.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index 4e408012..4b5d1274 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -325,7 +325,7 @@ class ConsoleState(flow.State):
class Options(object):
- __slots__ = [
+ attributes = [
"anticache",
"anticomp",
"client_replay",
@@ -352,7 +352,7 @@ class Options(object):
def __init__(self, **kwargs):
for k, v in kwargs.items():
setattr(self, k, v)
- for i in self.__slots__:
+ for i in self.attributes:
if not hasattr(self, i):
setattr(self, i, None)
diff --git a/libmproxy/dump.py b/libmproxy/dump.py
index 3c7eee71..3a315409 100644
--- a/libmproxy/dump.py
+++ b/libmproxy/dump.py
@@ -21,7 +21,7 @@ class DumpError(Exception): pass
class Options(object):
- __slots__ = [
+ attributes = [
"anticache",
"anticomp",
"client_replay",
@@ -45,7 +45,7 @@ class Options(object):
def __init__(self, **kwargs):
for k, v in kwargs.items():
setattr(self, k, v)
- for i in self.__slots__:
+ for i in self.attributes:
if not hasattr(self, i):
setattr(self, i, None)