added __init__ to test_figure_messages//typo//Py2 converts all grabbed plotly objects into json with strings, not unicode. Solves Py2 test error

Kully · Kully · commit a873bd9f15ee · 2018-05-22T14:38:55.000-04:00
diff --git a/plotly/basedatatypes.py b/plotly/basedatatypes.py
@@ -3175,7 +3175,7 @@ def on_change(self, callback, append=False, *args):
         subproperties of this object are modified.
 
         Callback will be invoked whenever ANY of these properties is
-        modified. Furthermore. The callback will only be invoked once even
+        modified. Furthermore, the callback will only be invoked once even
         if multiple properties are modified during the same restyle /
         relayout / update operation.
 
diff --git a/plotly/plotly/plotly.py b/plotly/plotly/plotly.py
@@ -374,6 +374,19 @@ def _swap_xy_data(data_obj):
             )
 
 
+def byteify(input):
+    """Convert unicode strings in JSON object to byte strings"""
+    if isinstance(input, dict):
+        return {byteify(key): byteify(value)
+                for key, value in input.iteritems()}
+    elif isinstance(input, list):
+        return [byteify(element) for element in input]
+    elif isinstance(input, unicode):
+        return input.encode('utf-8')
+    else:
+        return input
+
+
 def get_figure(file_owner_or_url, file_id=None, raw=False):
     """Returns a JSON figure representation for the specified file
 
@@ -444,7 +457,8 @@ def get_figure(file_owner_or_url, file_id=None, raw=False):
     fid = '{}:{}'.format(file_owner, file_id)
     response = v2.plots.content(fid, inline_data=True)
     figure = response.json()
-
+    if six.PY2:
+        figure = byteify(figure)
     # Fix 'histogramx', 'histogramy', and 'bardir' stuff
     for index, entry in enumerate(figure['data']):
         try:
@@ -481,19 +495,6 @@ def get_figure(file_owner_or_url, file_id=None, raw=False):
         if 'stream' in entry:
             del figure['data'][index]['stream']
 
-    # convert all unicde to string
-    if six.PY2:
-        for t, trace in enumerate(figure['data']):
-            for key in trace:
-                if isinstance(trace[key], unicode):
-                    figure['data'][t][key] = trace[key].encode('ascii',
-                                                               'ignore')
-
-        for key in figure['layout']:
-            if isinstance(figure['layout'][key], unicode):
-                figure['layout'][key] = figure['layout'][key].encode('ascii',
-                                                                     'ignore')
-
     if raw:
         return figure
     return tools.get_graph_obj(figure, obj_type='Figure')
diff --git a/plotly/tests/test_core/test_figure_messages/__init__.py b/plotly/tests/test_core/test_figure_messages/__init__.py
@@ -0,0 +1 @@
+
diff --git a/plotly/tools.py b/plotly/tools.py
@@ -1362,12 +1362,10 @@ def get_graph_obj(obj, obj_type=None):
     from plotly.graph_objs import graph_objs
     try:
         cls = getattr(graph_objs, obj_type)
-        print(cls)
     except (AttributeError, KeyError):
         raise exceptions.PlotlyError(
             "'{}' is not a recognized graph_obj.".format(obj_type)
         )
-    print(obj)
     return cls(obj)
 
 
