Generalize our PlotlyRequestError.

This is also some setup for a larger refact. Since v1 and v2 requests
handle errors differently, it’s easier if we simplify the api into our
errors so that the requests can go from `response` —> `python error` as
they see fit.

Author: theengineear

plotly/exceptions.py

@@ -18,29 +18,12 @@ class InputError(PlotlyError):
 
 
 class PlotlyRequestError(PlotlyError):
-    def __init__(self, requests_exception):
-        self.status_code = requests_exception.response.status_code
-        self.HTTPError = requests_exception
-        content_type = requests_exception.response.headers['content-type']
-        if 'json' in content_type:
-            content = requests_exception.response.content
-            if content != '':
-                res_payload = json.loads(
-                    requests_exception.response.content.decode('utf8')
-                )
-                if 'detail' in res_payload:
-                    self.message = res_payload['detail']
-                else:
-                    self.message = ''
-            else:
-                self.message = ''
-        elif content_type == 'text/plain':
-            self.message = requests_exception.response.content
-        else:
-            try:
-                self.message = requests_exception.message
-            except AttributeError:
-                self.message = 'unknown error'
+    """General API error. Raised for *all* failed requests."""
+
+    def __init__(self, message, status_code, content):
+        self.message = message
+        self.status_code = status_code
+        self.content = content
 
     def __str__(self):
         return self.message

plotly/plotly/plotly.py

@@ -1296,10 +1296,17 @@ def response_handler(cls, response):
                     message = errors[-1]['message']
                 except:
                     # otherwise raise a generic error
-                    raise exceptions.PlotlyRequestError(requests_exception)
+                    message = 'No content'
+                    status_code = requests_exception.status_code
+                    content = requests_exception.content
+                    raise exceptions.PlotlyRequestError(message, status_code,
+                                                        content)
                 else:
-                    requests_exception.message = message
-                    raise exceptions.PlotlyRequestError(requests_exception)
+                    message = requests_exception.message
+                    status_code = requests_exception.status_code
+                    content = requests_exception.content
+                    raise exceptions.PlotlyRequestError(message, status_code,
+                                                        content)
 
         if ('content-type' in response.headers and
                 'json' in response.headers['content-type'] and