Merge branch 'master' into revamp-get_subplots

Conflicts:
	plotly/version.py

Author: etpinard

plotly/grid_objs/grid_objs.py

@@ -67,7 +67,7 @@ def __init__(self, data, name):
 
     def __str__(self):
         max_chars = 10
-        jdata = json.dumps(self.data, cls=utils._plotlyJSONEncoder)
+        jdata = json.dumps(self.data, cls=utils.PlotlyJSONEncoder)
         if len(jdata) > max_chars:
             data_string = jdata[:max_chars] + "...]"
         else:

plotly/plotly/plotly.py

@@ -369,7 +369,7 @@ def get_figure(file_owner_or_url, file_id=None, raw=False):
                             verify=get_config()['plotly_ssl_verification'])
     if response.status_code == 200:
         if six.PY3:
-            content = json.loads(response.content.decode('unicode_escape'))
+            content = json.loads(response.content.decode('utf-8'))
         else:
             content = json.loads(response.content)
         response_payload = content['payload']
@@ -406,14 +406,15 @@ class Stream:
     Stream example:
     # Initialize a streaming graph
     # by embedding stream_id's in the graph's traces
-    >>> stream_id = "your_stream_id" # See {plotly_domain}/settings
-    >>> py.plot(Data([Scatter(x=[],
-                              y=[],
-                              stream=dict(token=stream_id, maxpoints=100))])
+    import plotly.plotly as py
+    from plotly.graph_objs import Data, Scatter, Stream
+    stream_id = "your_stream_id" # See {plotly_domain}/settings
+    py.plot(Data([Scatter(x=[], y=[],
+                          stream=Stream(token=stream_id, maxpoints=100))]))
     # Stream data to the import trace
-    >>> stream = Stream(stream_id) # Initialize a stream object
-    >>> stream.open() # Open the stream
-    >>> stream.write(dict(x=1, y=1)) # Plot (1, 1) in your graph
+    stream = Stream(stream_id) # Initialize a stream object
+    stream.open() # Open the stream
+    stream.write(dict(x=1, y=1)) # Plot (1, 1) in your graph
     """
 
     @utils.template_doc(**tools.get_config_file())
@@ -536,7 +537,7 @@ def write(self, trace, layout=None, validate=True,
             stream_object.update(dict(layout=layout))
 
         # TODO: allow string version of this?
-        jdata = json.dumps(stream_object, cls=utils._plotlyJSONEncoder)
+        jdata = json.dumps(stream_object, cls=utils.PlotlyJSONEncoder)
         jdata += "\n"
 
         try:
@@ -602,7 +603,7 @@ def get(figure_or_data, format='png', width=None, height=None):
 
         url = get_config()['plotly_domain'] + "/apigenimage/"
         res = requests.post(
-            url, data=json.dumps(payload, cls=utils._plotlyJSONEncoder),
+            url, data=json.dumps(payload, cls=utils.PlotlyJSONEncoder),
             headers=headers, verify=get_config()['plotly_ssl_verification']
         )
 
@@ -824,7 +825,7 @@ def upload(cls, grid, filename,
 
         payload = {
             'filename': filename,
-            'data': json.dumps(grid_json, cls=utils._plotlyJSONEncoder),
+            'data': json.dumps(grid_json, cls=utils.PlotlyJSONEncoder),
             'world_readable': world_readable
         }
 
@@ -905,7 +906,7 @@ def append_columns(cls, columns, grid=None, grid_url=None):
             raise exceptions.InputError(err)
 
         payload = {
-            'cols': json.dumps(columns, cls=utils._plotlyJSONEncoder)
+            'cols': json.dumps(columns, cls=utils.PlotlyJSONEncoder)
         }
 
         api_url = _api_v2.api_url('grids')+'/{grid_id}/col'.format(grid_id=grid_id)
@@ -980,7 +981,7 @@ def append_rows(cls, rows, grid=None, grid_url=None):
                                 'column' if n_columns == 1 else 'columns'))
 
         payload = {
-            'rows': json.dumps(rows, cls=utils._plotlyJSONEncoder)
+            'rows': json.dumps(rows, cls=utils.PlotlyJSONEncoder)
         }
 
         api_url = (_api_v2.api_url('grids')+
@@ -1098,7 +1099,7 @@ def upload(cls, meta, grid=None, grid_url=None):
         grid_id = _api_v2.parse_grid_id_args(grid, grid_url)
 
         payload = {
-            'metadata': json.dumps(meta, cls=utils._plotlyJSONEncoder)
+            'metadata': json.dumps(meta, cls=utils.PlotlyJSONEncoder)
         }
 
         api_url = _api_v2.api_url('grids')+'/{grid_id}'.format(grid_id=grid_id)
@@ -1206,14 +1207,14 @@ def _send_to_plotly(figure, **plot_options):
     """
     fig = tools._replace_newline(figure)  # does not mutate figure
     data = json.dumps(fig['data'] if 'data' in fig else [],
-                      cls=utils._plotlyJSONEncoder)
+                      cls=utils.PlotlyJSONEncoder)
     username, api_key = _get_session_username_and_key()
     kwargs = json.dumps(dict(filename=plot_options['filename'],
                              fileopt=plot_options['fileopt'],
                              world_readable=plot_options['world_readable'],
                              layout=fig['layout'] if 'layout' in fig
                              else {}),
-                        cls=utils._plotlyJSONEncoder)
+                        cls=utils.PlotlyJSONEncoder)
 
 
     payload = dict(platform='python', # TODO: It'd be cool to expose the platform for RaspPi and others

plotly/tests/test_core/test_get_figure/test_get_figure.py

@@ -9,6 +9,11 @@
 from plotly.plotly import plotly as py
 from plotly import exceptions
 from nose.tools import raises
+import six
+import json
+
+from unittest import TestCase
+from unittest import skipIf
 
 
 # username for tests: 'plotlyimagetest'
@@ -191,4 +196,14 @@ def test_all():
                                      "following output is produced...")
 
 
+class TestBytesVStrings(TestCase):
 
+    @skipIf(not six.PY3, 'Decoding and missing escapes is only seen in PY3')
+    def test_proper_escaping(self):
+        un = 'PlotlyImageTest'
+        ak = '786r5mecv0'
+        url = "https://plot.ly/~PlotlyImageTest/91/"
+        py.sign_in(un, ak)
+        print("getting: https://plot.ly/~PlotlyImageTest/91/")
+        print("###########################################\n\n")
+        fig = py.get_figure(url)

plotly/tests/test_optional/test_utils/__init__.py

@@ -0,0 +1,3 @@
+def setup_package():
+    import warnings
+    warnings.filterwarnings('ignore')