[MERGE] Small tweaks to cleanup imports

[John Arbash Meinel]

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

This is just a couple of tweaks to some imports, to move more things into
being lazily loaded.

I noticed because the time for "bzr nick" was surprisingly long. On the plus
side, while this is noticeable for the installed bzr (1.5), it is a *lot*
better for 1.6b3. (About 500+ms => 130ms).

Overall, this doesn't make things a huge amount better, but I did the work, so
we might as well merge it.

Ok... weird. I just removed all of bzr and reinstalled (for other reasons). It
was running really slow until I ran "sudo bzr nick". After that, the global
installed version seems to be a lot faster. Uninstalling and re-installing
doesn't seem to trigger the bug.

I wonder if somehow my system decided that the .pyc files were out of date,
and it was re-compiling each run. Until I ran 'sudo bzr'. But then why
wouldn't uninstalling and re-installing trigger this?

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

iD8DBQFIdRnBJdeBCYSNAAMRAogzAJ9/Idbt/Oz0W6APXvYJQYBj1sLnwQCgkBw9
XpBoCOw9hv4bw4ebBCSB62c=
=d9Ne
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: lean_imports.patch
Type: text/x-diff
Size: 16634 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080709/42a23994/attachment.bin