Decode byte-strings (more)

1. Plotly uses 2.7 on the backend so it will
return bytes! The json 3.x module expects native
string (unicode), so we need to convert this.

2. base64encode requires bytes, so give it bytes 
and convert after.

Author: theengineear

plotly/exceptions.py

@@ -16,6 +16,7 @@
 
 """
 import json
+import six
 
 ## Base Plotly Error ##
 
@@ -36,7 +37,9 @@ def __init__(self, requests_exception):
         if 'json' in content_type:
             content = requests_exception.response.content
             if content != '':
-                res_payload = json.loads(requests_exception.response.content)
+                res_payload = json.loads(
+                    requests_exception.response.content.decode('utf8')
+                )
                 if 'detail' in res_payload:
                     self.message = res_payload['detail']
                 else:

plotly/plotly/plotly.py

@@ -913,7 +913,7 @@ def response_handler(cls, response):
                 'json' in response.headers['content-type'] and
                 len(response.content) > 0):
 
-            response_dict = json.loads(response.content)
+            response_dict = json.loads(response.content.decode('utf8'))
 
             if 'warnings' in response_dict and len(response_dict['warnings']):
                 warnings.warn('\n'.join(response_dict['warnings']))
@@ -928,7 +928,10 @@ def api_url(cls, resource):
     @classmethod
     def headers(cls):
         un, api_key = _get_session_username_and_key()
-        encoded_un_key_pair = base64.b64encode('{}:{}'.format(un, api_key))
+        encoded_un_key_pair = base64.b64encode(
+            six.b('{}:{}'.format(un, api_key))
+        ).decode('utf8')
+
         return {
             'authorization': 'Basic ' + encoded_un_key_pair,
             'plotly-client-platform': 'python {}'.format(version.__version__)