Update upload.py from rietveld @ 7696eca367d2.
Update upload.py from rietveld @ 7696eca367d2.

---

Trap failure to get password from keyring

It happens when using upload.py from a ssh session without a X session but
gnomekeyring is used.

R=dpranke@chromium.org
BUG=
TEST=

Review URL: http://codereview.chromium.org/7715013

git-svn-id: bd64dd6fa6f3f0ed0c0666d1018379882b742947@97909 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

svn2github/chromium-depot-tools,svn2github/chromium-depot-tools,svn2github/chromium-depot-tools