Update upload.py from rietveld @ 7696eca367d2.

third_party/upload.py

 #!/usr/bin/env python
 #
 # Copyright 2007 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 594 matching lines @@
         save_cookies=save_cookies,
         account_type=account_type)
     # Don't try to talk to ClientLogin.
     server.authenticated = True
     return server
 
   def GetUserCredentials():
     """Prompts the user for a username and password."""
     # Create a local alias to the email variable to avoid Python's crazy
     # scoping rules.
+    global keyring
     local_email = email
     if local_email is None:
       local_email = GetEmail("Email (login for uploading to %s)" % server)
     password = None
     if keyring:
-      password = keyring.get_password(host, local_email)
+      try:
+        password = keyring.get_password(host, local_email)
+      except:
+        # Sadly, we have to trap all errors here as
+        # gnomekeyring.IOError inherits from object. :/

[Dirk Pranke, 2011/08/23 20:13:27]

I don't get this; you're saying that you can't check the type of the exception
at all? Can you retrieve it from sys.exc_info() and check the type that way?

[M-A Ruel, 2011/08/23 20:14:36]

No, that the keyring module is a leaky abstraction. Depending if you get the
gnome keyring or the macosx keychain, the exception will be different without
any common base class.

+        print "Failed to get password from keyring"
+        keyring = None
     if password is not None:
       print "Using password from system keyring."
     else:
       password = getpass.getpass("Password for %s: " % local_email)
       if keyring:
         answer = raw_input("Store password in system keyring?(y/N) ").strip()
         if answer == "y":
           keyring.set_password(host, local_email, password)
     return (local_email, password)
 
@@ skipping 1618 matching lines @@
     os.environ['LC_ALL'] = 'C'
     RealMain(sys.argv)
   except KeyboardInterrupt:
     print
     StatusUpdate("Interrupted.")
     sys.exit(1)
 
 
 if __name__ == "__main__":
   main()