Remove __slots__ to make it possible to inherit from Options classes.

snemes · Mar 2, 2013 · e608d10 · e608d10
1 parent 75b5c97
commit e608d10
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
@@ -325,7 +325,7 @@ def delete_flow(self, f):
 
 
 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
@@ -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)
 

diff --git a/test/test_dump.py b/test/test_dump.py
@@ -101,7 +101,6 @@ def test_read(self):
     def test_options(self):
         o = dump.Options(verbosity = 2)
         assert o.verbosity == 2
-        libpry.raises(AttributeError, dump.Options, nonexistent = 2)
 
     def test_filter(self):
         assert not "GET" in self._dummy_cycle(1, "~u foo", "", verbosity=1)

diff --git a/test/test_proxy.py b/test/test_proxy.py
@@ -146,4 +146,3 @@ def test_simple(self):
         d.start_slave()
         d.shutdown()
 
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -146,4 +146,3 @@ def test_simple(self):
		d.start_slave()
		d.shutdown()