Update upload.py from upstream at 40853b0f868a.

Update upload.py from upstream at d5f7dffc2dbb.

Fix issue with invalid password in keyring and git renames.

R=petermayo@chromium.org
BUG=144408
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=155898

[M-A Ruel, 2012-09-07 21:29:18]

Sam, can you confirm this works? I do not use keyring over here.

[Sam Clegg, 2012-09-07 21:40:56]

On 2012/09/07 21:29:18, Marc-Antoine Ruel wrote:
> Sam, can you confirm this works? I do not use keyring over here.

I get the following crash if I set the password in the keyring
to be incorrect:


Email (login for uploading to https://chromiumcodereview.appspot.com)
[sbc@chromium.org]: 
Using password from system keyring.
Traceback (most recent call last):
  File "/home/sbc/bin/depot_tools/git_cl.py", line 1708, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/home/sbc/bin/depot_tools/git_cl.py", line 1693, in main
    return command(parser, argv[1:])
  File "/home/sbc/bin/depot_tools/git_cl.py", line 1142, in CMDupload
    return RietveldUpload(options, args, cl)
  File "/home/sbc/bin/depot_tools/git_cl.py", line 1057, in RietveldUpload
    issue, patchset = upload.RealMain(['upload'] + upload_args + args)
  File "/home/sbc/bin/depot_tools/third_party/upload.py", line 2325, in RealMain
    response_body = rpc_server.Send("/upload", body, content_type=ctype)
  File "/home/sbc/bin/depot_tools/third_party/upload.py", line 409, in Send
    self._Authenticate()
  File "/home/sbc/bin/depot_tools/third_party/upload.py", line 428, in
_Authenticate
    super(HttpRpcServer, self)._Authenticate()
  File "/home/sbc/bin/depot_tools/third_party/upload.py", line 316, in
_Authenticate
    credentials = self.auth_function()
  File "/home/sbc/bin/depot_tools/third_party/upload.py", line 636, in
GetUserCredentials
    self.accounts_seen.append(email)
AttributeError: 'set' object has no attribute 'append'

[M-A Ruel, 2012-09-07 21:59:11]

Argh, and if you replace append with add?
Le 7 sept. 2012 17:40, <sbc@chromium.org> a écrit :

> On 2012/09/07 21:29:18, Marc-Antoine Ruel wrote:
>
>> Sam, can you confirm this works? I do not use keyring over here.
>>
>
> I get the following crash if I set the password in the keyring
> to be incorrect:
>
>
> Email (login for uploading to
https://chromiumcodereview.**appspot.com<https://chromiumcodereview.appspot.com>
> )
> [sbc@chromium.org]:
> Using password from system keyring.
> Traceback (most recent call last):
>   File "/home/sbc/bin/depot_tools/**git_cl.py", line 1708, in <module>
>     sys.exit(main(sys.argv[1:]))
>   File "/home/sbc/bin/depot_tools/**git_cl.py", line 1693, in main
>     return command(parser, argv[1:])
>   File "/home/sbc/bin/depot_tools/**git_cl.py", line 1142, in CMDupload
>     return RietveldUpload(options, args, cl)
>   File "/home/sbc/bin/depot_tools/**git_cl.py", line 1057, in
> RietveldUpload
>     issue, patchset = upload.RealMain(['upload'] + upload_args + args)
>   File "/home/sbc/bin/depot_tools/**third_party/upload.py", line 2325, in
> RealMain
>     response_body = rpc_server.Send("/upload", body, content_type=ctype)
>   File "/home/sbc/bin/depot_tools/**third_party/upload.py", line 409, in
> Send
>     self._Authenticate()
>   File "/home/sbc/bin/depot_tools/**third_party/upload.py", line 428, in
> _Authenticate
>     super(HttpRpcServer, self)._Authenticate()
>   File "/home/sbc/bin/depot_tools/**third_party/upload.py", line 316, in
> _Authenticate
>     credentials = self.auth_function()
>   File "/home/sbc/bin/depot_tools/**third_party/upload.py", line 636, in
> GetUserCredentials
>     self.accounts_seen.append(**email)
> AttributeError: 'set' object has no attribute 'append'
>
>
>
https://chromiumcodereview.**appspot.com/10907089/<https://chromiumcodereview...
>

[Peter Mayo, 2012-09-07 22:00:16]

lgtm

It looks sane if it works.  I'm not completely sure of the closure of a method
as an argument without a lambda, but I expect the author is.

[M-A Ruel, 2012-09-11 01:23:39]

Updated again.

[commit-bot: I haz the power, 2012-09-11 01:24:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/maruel@chromium.org/10907089/1002

[commit-bot: I haz the power, 2012-09-11 01:26:24]

Change committed as 155898