Merge pull request #149 from plotly/fix-pandas-serialization

Fix pandas serialization

Author: chriddyp

plotly/grid_objs/grid_objs.py

@@ -35,7 +35,7 @@ def __str__(self):
     def __repr__(self):
         return 'Column("{}", {})'.format(self.data, self.name)
 
-    def to_json(self):
+    def to_plotly_json(self):
         return {'name': self.name, 'data': self.data}
 
 

plotly/tests/test_optional/test_utils/test_utils.py

@@ -5,15 +5,17 @@
 from datetime import datetime as dt
 import numpy as np
 import json
+import pandas as pd
 
 from plotly import utils
 from plotly.grid_objs import Column
-from plotly.graph_objs import Scatter3d, Figure, Data
+from plotly.graph_objs import Scatter, Scatter3d, Figure, Data
 
 ## JSON encoding
 numeric_list = [1, 2, 3]
 np_list = np.array([1, 2, 3])
 mixed_list = [1, 'A', dt(2014, 1, 5)]
+pd = pd.DataFrame(columns=['col 1'], data=[1, 2, 3])
 
 
 def test_column_json_encoding():
@@ -31,10 +33,16 @@ def test_column_json_encoding():
 
 
 def test_figure_json_encoding():
-    s = Scatter3d(x=numeric_list, y=np_list, z=mixed_list)
-    data = Data([s])
+    s1 = Scatter3d(x=numeric_list, y=np_list, z=mixed_list)
+    s2 = Scatter(x=pd['col 1'])
+    data = Data([s1, s2])
     figure = Figure(data=data)
 
-    json.dumps(s, cls=utils._plotlyJSONEncoder)
-    json.dumps(data, cls=utils._plotlyJSONEncoder)
-    json.dumps(figure, cls=utils._plotlyJSONEncoder)
+    js1 = json.dumps(s1, cls=utils._plotlyJSONEncoder, sort_keys=True)
+    js2 = json.dumps(s2, cls=utils._plotlyJSONEncoder, sort_keys=True)
+
+    assert(js1 == '{"type": "scatter3d", "x": [1, 2, 3], '+
+                  '"y": [1, 2, 3], "z": [1, "A", "2014-01-05"]}')
+    assert(js2 == '{"type": "scatter", "x": [1, 2, 3]}')
+    json.dumps(data, cls=utils._plotlyJSONEncoder, sort_keys=True)
+    json.dumps(figure, cls=utils._plotlyJSONEncoder, sort_keys=True)

plotly/utils.py

@@ -128,7 +128,7 @@ def sageJSONEncoder(self, obj):
 
     def builtinJSONEncoder(self, obj):
         try:
-            return obj.to_json()
+            return obj.to_plotly_json()
         except AttributeError:
             return None
 

plotly/version.py

@@ -1 +1 @@
-__version__ = '1.4.3'
+__version__ = '1.4.4'