Moving FlatStore to it's own module.

jkeyes · jkeyes · commit 36042c28a41f · 2014-07-23T23:33:22.000+01:00
diff --git a/intercom/__init__.py b/intercom/__init__.py
@@ -1,42 +1,7 @@
-import numbers
 from datetime import datetime
 from .errors import ArgumentError
 
 
-class FlatStore(dict):
-
-    def __init__(self, *args, **kwargs):
-        self.update(*args, **kwargs)
-
-    def __setitem__(self, key, value):
-        # print "SETTING ITEM [%s]=[%s]" % (key, value)
-        if not (
-            isinstance(value, numbers.Real) or
-            isinstance(value, basestring)
-        ):
-            raise ValueError(
-                "custom data only allows string and real number values")
-        if not isinstance(key, basestring):
-            raise ValueError("custom data only allows string keys")
-        super(FlatStore, self).__setitem__(key, value)
-
-    def update(self, *args, **kwargs):
-        if args:
-            if len(args) > 1:
-                raise TypeError("update expected at most 1 arguments, "
-                                "got %d" % len(args))
-            other = dict(args[0])
-            for key in other:
-                self[key] = other[key]
-        for key in kwargs:
-            self[key] = kwargs[key]
-
-    def setdefault(self, key, value=None):
-        if key not in self:
-            self[key] = value
-        return self[key]
-
-
 class SetterProperty(object):
 
     def __init__(self, func, doc=None):
diff --git a/intercom/lib/flat_store.py b/intercom/lib/flat_store.py
@@ -0,0 +1,35 @@
+import numbers
+
+
+class FlatStore(dict):
+
+    def __init__(self, *args, **kwargs):
+        self.update(*args, **kwargs)
+
+    def __setitem__(self, key, value):
+        # print "SETTING ITEM [%s]=[%s]" % (key, value)
+        if not (
+            isinstance(value, numbers.Real) or
+            isinstance(value, basestring)
+        ):
+            raise ValueError(
+                "custom data only allows string and real number values")
+        if not isinstance(key, basestring):
+            raise ValueError("custom data only allows string keys")
+        super(FlatStore, self).__setitem__(key, value)
+
+    def update(self, *args, **kwargs):
+        if args:
+            if len(args) > 1:
+                raise TypeError("update expected at most 1 arguments, "
+                                "got %d" % len(args))
+            other = dict(args[0])
+            for key in other:
+                self[key] = other[key]
+        for key in kwargs:
+            self[key] = kwargs[key]
+
+    def setdefault(self, key, value=None):
+        if key not in self:
+            self[key] = value
+        return self[key]
diff --git a/intercom/user.py b/intercom/user.py
@@ -7,13 +7,13 @@
 
 import datetime
 import time
-from intercom import FlatStore
 from intercom.api_operations.all import All
 from intercom.api_operations.count import Count
 from intercom.api_operations.delete import Delete
 from intercom.api_operations.find import Find
 from intercom.api_operations.find_all import FindAll
 from intercom.api_operations.save import Save
+from intercom.lib.flat_store import FlatStore
 from intercom.lib.typed_json_deserializer import JsonDeserializer
 
 
diff --git a/tests/unit/user_spec.py b/tests/unit/user_spec.py
@@ -66,7 +66,7 @@ def it_presents_a_complete_user_record_correctly(self):
         expect(1393613864) == time.mktime(user.remote_created_at.timetuple())
         expect(1401970114) == time.mktime(user.updated_at.timetuple())
 
-        from intercom import FlatStore
+        from intercom.lib.flat_store import FlatStore
         from intercom.user import create_class_instance
         Avatar = create_class_instance('Avatar')
         Company = create_class_instance('Company')
