Merge pull request #2 from dealertrack/attr

enforcing __slots__ usage in __setattr__ for py<3 compatibility
dealertrack · May 11, 2017 · 1d3817e · 1d3817e
2 parents b734145 + 2364a3f
commit 1d3817e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -7,7 +7,6 @@ History
 ~~~~~~~~~~~~~~~~~~
 
 * Add attribute support
-
 * Add make watch target
 
 0.1.0 (2017-03-22)

diff --git a/pycontext/context.py b/pycontext/context.py
@@ -155,9 +155,9 @@ def __setattr__(self, key, value):
         :param key: the name of the variable
         :param value: the variable value
         """
-        try:
+        if key in self.__slots__:
             super(Context, self).__setattr__(key, value)
-        except AttributeError:
+        else:
             self.__setitem__(key, value)
 
     def __eq__(self, other):

diff --git a/tests/test_context.py b/tests/test_context.py
@@ -265,6 +265,7 @@ def test_attributes(self):
         self.context.push({'qwe': 'asd'})
         self.assertEqual(self.context.foo, 'bar')
         self.assertEqual(self.context.hello, 'world')
+        self.assertEqual(self.context['hello'], 'world')
         self.assertEqual(self.context.qwe, 'asd')
 
         with self.assertRaises(AttributeError):