Fix gsdcurl to correctly URL-quote a password passed via GSDCURL_PASSWORD

bin/cros_gsdcurl.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 import getpass
 import os
 import re
 import subprocess
 import sys
 import tempfile
 import urllib
 
 
 def Authenticate():
   # Authenticate.
   default_username = os.environ.get('LOGNAME', '')
   username = os.environ.get('GSDCURL_USERNAME')
   if username is None:
     sys.stderr.write('Username [' + default_username + ']: ')
     username = raw_input()
   if username == '':
     username = default_username + '@google.com'
   elif '@' not in username:
     username = username + '@google.com'
   passwd = os.environ.get('GSDCURL_PASSWORD')
   if passwd is None:
     sys.stderr.write('Password: ')
-    passwd = urllib.quote_plus(getpass.getpass(prompt=''))
+    passwd = getpass.getpass(prompt='')
   cmd = [
       'curl', '--silent', 'https://www.google.com/accounts/ClientLogin',
       '-d', 'Email=' + username,
-      '-d', 'Passwd=' + passwd,
+      '-d', 'Passwd=' + urllib.quote_plus(passwd),
       '-d', 'accountType=GOOGLE',
       '-d', 'source=Google-gsdcurl-ver1',
       '-d', 'service=cds',
   ]
   p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
   (p_stdout, _) = p.communicate()
   assert p.returncode == 0
   m = re.search('\nAuth=([^\n]+)\n', p_stdout)
   if not m:
     sys.stderr.write('BAD LOGIN\n')
@@ skipping 16 matching lines @@
     os.remove(cookies)
 
 
 def main(argv):
   auth = Authenticate()
   return DoCurl(auth, argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))