Merge pull request #201 from plotly/update-image-endpoint

Move from genimage —> v2/images/
plotly · Mar 13, 2015 · ff362ce · ff362ce
2 parents 7d27874 + 5139385
commit ff362ce
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/plotly/plotly/plotly.py b/plotly/plotly/plotly.py
@@ -23,6 +23,7 @@
 import six
 import base64
 import requests
+from requests.auth import HTTPBasicAuth
 
 if sys.version[:1] == '2':
     from urlparse import urlparse
@@ -586,25 +587,22 @@ def get(figure_or_data, format='png', width=None, height=None):
         credentials = get_credentials()
         validate_credentials(credentials)
         username, api_key = credentials['username'], credentials['api_key']
-        headers = {'plotly-username': username,
-                   'plotly-apikey': api_key,
-                   'plotly-version': version.__version__,
-                   'plotly-platform': 'python'}
-
-        payload = {
-            'figure': figure,
-            'format': format
-        }
+        headers = {'Plotly-Version': version.__version__,
+                   'Content-Type': 'application/json',
+                   'Plotly-Client-Platform': 'python'}
 
+        payload = {'figure': figure, 'format': format}
         if width is not None:
             payload['width'] = width
         if height is not None:
             payload['height'] = height
 
-        url = get_config()['plotly_domain'] + "/apigenimage/"
+        url = _api_v2.api_url('images/')
+
         res = requests.post(
             url, data=json.dumps(payload, cls=utils.PlotlyJSONEncoder),
-            headers=headers, verify=get_config()['plotly_ssl_verification']
+            headers=headers, verify=get_config()['plotly_ssl_verification'],
+            auth=HTTPBasicAuth(username, api_key)
         )
 
         headers = res.headers