[PATCH] BZR_HOSTKEYS.add instead of dict method (was: Re: problems with bzr 0.10 and paramiko sftp transfer)

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> (I re-send this patch because BB miss it)
> 
> Here is forgotten fix made by John Meinel in august (see history below).
> There is also corresponding bug report: #70398.
> 
> I really don't know how to test this.

+            if add is not None: # paramiko >= 1.X.X
+                BZR_HOSTKEYS.add(host, keytype, server_key)
+            else:
+                BZR_HOSTKEYS.set_default(host, {})[keytype] = server_key

Unfortunately, the dict method name is setdefault, not set_default, so
this patch breaks on my machine with paramiko 1.5.2.  I've submitted a
bugfix.  (without a merge request, because it's trivial).

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFXTSu0F+nu1YWqI0RAiOBAJ9Bfky41F5VHn+fKTkGhto6Oct25QCcCsSp
3YVoEkuzc9WbhawheVRXwaI=
=zGDq
-----END PGP SIGNATURE-----