Clean up in reflex

Author: jonathan-s

requirements_dev.txt

@@ -6,4 +6,3 @@ invoke
 twine
 wheel
 zest.releaser
-

requirements_test.txt

@@ -6,3 +6,6 @@ codecov>=2.0.0
 gitpython
 invoke
 tox-venv
+
+pytest
+pytest-django

sockpuppet/reflex.py

@@ -27,49 +27,37 @@ class Context(UserDict):
 
     > context.my_data = 'hello'
     > context.my_data  # 'hello'
+
+    The following property will contain all data of the dictionary
+    > context.data
     """
 
     # NOTE for maintainer
     # A dictionary that keeps track of whether it's been used as dictionary
     # or if values has been set with dot notation. We expect things to be set
     # in dot notation so a warning is issued until next major version (1.0)
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._attr_data = {}
-
     def __getitem__(self, key):
         data = self.__dict__
-        if (
-            data["data"].get(key, KeyError) is KeyError
-            and data["_attr_data"].get(key, KeyError) is KeyError
-        ):
+        if data["data"].get(key, KeyError) is KeyError:
             raise KeyError(key)
-        return self.data.get(key) or self._attr_data.get(key)
-
-    def __setitem__(self, key, item):
-        if not self.__dict__.get("data"):
-            self.__dict__["data"] = {}
-        self.__dict__["data"][key] = item
+        return self.data.get(key)
 
     def __getattr__(self, key):
         if not self.__dict__.get("data"):
             self.__dict__["data"] = {}
-        if not self.__dict__.get("_attr_data"):
-            self.__dict__["_attr_data"] = {}
 
-        if (
-            self.__dict__["data"].get(key, KeyError) is KeyError
-            and self.__dict__["_attr_data"].get(key, KeyError) is KeyError
-        ):
+        if self.__dict__["data"].get(key, KeyError) is KeyError:
             raise AttributeError(key)
-        result = self.data.get(key) or self._attr_data.get(key)
+        result = self.data.get(key)
         return result
 
     def __setattr__(self, key, value):
-        if not self.__dict__.get("_attr_data"):
-            self.__dict__["_attr_data"] = {}
-        self.__dict__["_attr_data"][key] = value
+        if not self.__dict__.get("data"):
+            self.__dict__["data"] = {}
+        if key == "data" and value == {}:
+            return
+        self.__dict__["data"][key] = value
 
 
 class Reflex:

tests/test_reflex.py

@@ -20,9 +20,6 @@ def test_context_api_works_correctly(self):
         self.assertEqual(context.hello, 'hello')
         self.assertEqual(context['hello'], 'hello')
 
-        self.assertEqual(context.data.get('hello'), None)
-        self.assertEqual(context._attr_data.get('hello'), 'hello')
-
         with self.assertRaises(AttributeError):
             context.not_an_attribute