Merge pull request plotly#169 from plotly/python3-bytes-decoding-fix

theengineear · theengineear · commit d9b7cdc27113 · 2014-12-23T11:34:07.000-08:00
Python3 bytes decoding fix
diff --git a/plotly/plotly/plotly.py b/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']
diff --git a/plotly/tests/test_core/test_get_figure/test_get_figure.py b/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)
diff --git a/plotly/version.py b/plotly/version.py
@@ -1 +1 @@
-__version__ = '1.4.13'
+__version__ = '1.4.14'

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = '1.4.13'`
	`1`	`+__version__ = '1.4.14'`