Moving create_class_instance from user to utils.

jkeyes · jkeyes · commit 640d9257e5ea · 2014-07-24T00:07:30.000+01:00
diff --git a/intercom/user.py b/intercom/user.py
@@ -14,26 +14,6 @@
 from intercom.traits.api_resource import Resource
 from intercom.traits.incrementable_attributes import IncrementableAttributes
 
-
-CLASS_REGISTRY = {}
-
-def create_class_instance(class_name):
-
-    if class_name in CLASS_REGISTRY:
-        return CLASS_REGISTRY[class_name]
-
-    class Meta(type):
-        def __new__(mcs, name, bases, attributes):
-            return super(Meta, mcs).__new__(mcs, str(class_name), bases, attributes)
-
-    class DynamicClass(Resource):
-        __metaclass__ = Meta
-
-    dyncls = DynamicClass()
-    CLASS_REGISTRY[class_name] = dyncls
-    return dyncls
-
-
 class User(Resource, Find, FindAll, All, Count, Save, Delete, IncrementableAttributes):
 
     @property
diff --git a/intercom/utils.py b/intercom/utils.py
@@ -17,7 +17,6 @@ def entity_key_from_type(type):
 
 def constantize_singular_resource_name(resource_name):
     class_name = inflection.camelize(resource_name)
-    from intercom.user import create_class_instance
     return create_class_instance(class_name)
 
 
@@ -27,3 +26,23 @@ def resource_class_to_collection_name(cls):
 
 def resource_class_to_name(cls):
     return cls.__name__.lower()
+
+
+CLASS_REGISTRY = {}
+
+def create_class_instance(class_name):
+    from intercom.traits.api_resource import Resource
+
+    if class_name in CLASS_REGISTRY:
+        return CLASS_REGISTRY[class_name]
+
+    class Meta(type):
+        def __new__(mcs, name, bases, attributes):
+            return super(Meta, mcs).__new__(mcs, str(class_name), bases, attributes)
+
+    class DynamicClass(Resource):
+        __metaclass__ = Meta
+
+    dyncls = DynamicClass()
+    CLASS_REGISTRY[class_name] = dyncls
+    return dyncls
diff --git a/tests/unit/user_spec.py b/tests/unit/user_spec.py
@@ -16,7 +16,7 @@
 from intercom.collection_proxy import CollectionProxy
 from intercom.lib.flat_store import FlatStore
 from intercom.user import User
-from intercom.user import create_class_instance
+from intercom.utils import create_class_instance
 from tests.unit import test_user_obj
 
 
