[MERGE] python2.6 compatibility

[John Arbash Meinel]

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

Someone was reporting some incompatibilities about bzr + python2.6

I don't have python2.6 around to test with, but I at least addressed his
direct issues.

One of them is just bogus on our part (passing something to a base class
that doesn't allow it.) The other is something that we seem to import,
but that we don't actually need.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkjKw/UACgkQJdeBCYSNAAP9cQCfV5AC9YgGxZ60qa2NB2efmprK
AwQAn1R9eu201J8YTU9YpxLzqJu6OmV9
=wXF0
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: bug_269535.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080912/a0d4088e/attachment-0001.diff