change proxy_passwd ---> proxy_password

BRONSOLO · BRONSOLO · commit 43aded3ae0dc · 2015-06-30T14:02:39.000-04:00
diff --git a/plotly/plotly/plotly.py b/plotly/plotly/plotly.py
@@ -1201,18 +1201,14 @@ def headers(cls):
             username, api_key))).decode('utf8')
 
         headers = {
-            'authorization': 'Basic ' + encoded_api_auth,
             'plotly-client-platform': 'python {0}'.format(version.__version__)
         }
 
         if get_config()['plotly_proxy_authorization']:
-
-            # custom enterprise + proxy authentication
             proxy_username = credentials['proxy_username']
-            proxy_passwd = credentials['proxy_passwd']
+            proxy_password = credentials['proxy_password']
             encoded_proxy_auth = base64.b64encode(six.b('{0}:{1}'.format(
-                proxy_username, proxy_passwd))).decode('utf8')
-
+                proxy_username, proxy_password))).decode('utf8')
             headers['authorization'] = 'Basic ' + encoded_proxy_auth
             headers['plotly-authorization'] = 'Basic ' + encoded_api_auth
 
diff --git a/plotly/tools.py b/plotly/tools.py
@@ -49,7 +49,7 @@ def warning_on_one_line(message, category, filename, lineno, file=None, line=Non
 _FILE_CONTENT = {CREDENTIALS_FILE: {'username': '',
                                     'api_key': '',
                                     'proxy_username': '',
-                                    'proxy_passwd': '',
+                                    'proxy_password': '',
                                     'api_key': '',
                                     'stream_ids': []},
                  CONFIG_FILE: {'plotly_domain': 'https://plot.ly',
@@ -103,8 +103,11 @@ def ensure_local_plotly_files():
 
 ### credentials tools ###
 
-def set_credentials_file(username=None, api_key=None, proxy_username=None,
-                         proxy_passwd=None, stream_ids=None):
+def set_credentials_file(username=None,
+                         api_key=None,
+                         stream_ids=None,
+                         proxy_username=None,
+                         proxy_password=None):
     """Set the keyword-value pairs in `~/.plotly_credentials`.
 
     :param (str) username: The username you'd use to sign in to Plotly
@@ -125,8 +128,8 @@ def set_credentials_file(username=None, api_key=None, proxy_username=None,
         credentials['api_key'] = api_key
     if isinstance(proxy_username, six.string_types):
         credentials['proxy_username'] = proxy_username
-    if isinstance(proxy_passwd, six.string_types):
-        credentials['proxy_passwd'] = proxy_passwd
+    if isinstance(proxy_password, six.string_types):
+        credentials['proxy_password'] = proxy_password
     if isinstance(stream_ids, (list, tuple)):
         credentials['stream_ids'] = stream_ids
     utils.save_json_dict(CREDENTIALS_FILE, credentials)
