making utils independent

chriddyp · chriddyp · commit d7e770daebcd · 2014-11-07T16:46:09.000+01:00
diff --git a/plotly/grid_objs/grid_objs.py b/plotly/grid_objs/grid_objs.py
@@ -9,7 +9,7 @@
 import json
 from collections import MutableSequence
 from plotly import exceptions
-import plotly
+from plotly import utils
 
 __all__ = None
 
@@ -24,7 +24,7 @@ def __init__(self, data, name):
 
     def __str__(self):
         max_chars = 10
-        jdata = json.dumps(self.data, cls=plotly.utils._plotlyJSONEncoder)
+        jdata = json.dumps(self.data, cls=utils._plotlyJSONEncoder)
         if len(jdata) > max_chars:
             data_string = jdata[:max_chars] + "...]"
         else:
@@ -33,13 +33,16 @@ def __str__(self):
         return string.format(name=self.name, data=data_string, id=self.id)
 
     def __repr__(self):
-        return  'Column("{}", {})'.format(self.data, self.name)
+        return 'Column("{}", {})'.format(self.data, self.name)
+
+    def to_json(self):
+        return {'name': self.name, 'data': self.data}
 
 
 class Grid(MutableSequence):
     def __init__(self, iterable_of_columns):
         column_names = [column.name for column in iterable_of_columns]
-        duplicate_name = plotly.utils.get_first_duplicate(column_names)
+        duplicate_name = utils.get_first_duplicate(column_names)
         if duplicate_name:
             err = exceptions.NON_UNIQUE_COLUMN_MESSAGE.format(duplicate_name)
             raise exceptions.InputError(err)
diff --git a/plotly/utils.py b/plotly/utils.py
@@ -12,8 +12,6 @@
 import threading
 import re
 
-import plotly
-
 ### incase people are using threading, we lock file reads
 lock = threading.Lock()
 
@@ -128,19 +126,18 @@ def sageJSONEncoder(self, obj):
             pass
         return None
 
-    def ColumnJSONEncoder(self, obj):
-        if isinstance(obj, plotly.grid_objs.Column):
-            return {'name': obj.name, 'data': obj.data}
-        else:
+    def builtinJSONEncoder(self, obj):
+        try:
+            return obj.to_json()
+        except AttributeError:
             return None
 
-
     def default(self, obj):
         try:
             return json.dumps(obj)
         except TypeError as e:
-            encoders = (self.datetimeJSONEncoder, self.numpyJSONEncoder,
-                        self.pandasJSONEncoder, self.ColumnJSONEncoder,
+            encoders = (self.builtinJSONEncoder, self.datetimeJSONEncoder,
+                        self.numpyJSONEncoder, self.pandasJSONEncoder,
                         self.sageJSONEncoder)
             for encoder in encoders:
                 s = encoder(obj)
