Merge lp:~vila/bzr-guess/690563-lazy-import into lp:bzr-guess

[Vincent Ladeuil]

Use lazy imports to make bzrlib.tests.test_import_tariff.TestImportTariffs.test_simple_local happy.

[John A Meinel (jameinel)]

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

On 12/15/2010 3:55 AM, Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr-guess/690563-lazy-import into lp:bzr-guess.
>
> Requested reviews:
> Bazaar Developers (bzr)
> Related bugs:
> #690563 bzrlib.tests.test_import_tariff.TestImportTariffs.test_simple_local failure
> https://bugs.launchpad.net/bugs/690563
>
>
> Use lazy imports to make bzrlib.tests.test_import_tariff.TestImportTariffs.test_simple_local happy.
>

 review: needs_fixing

I'm pretty sure the module isn't called "patiendiff".

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

iEYEARECAAYFAk0I6qYACgkQJdeBCYSNAAPwzQCgi7B1fKT87O9QGbWRNLpNg/ka
/HcAnREcMwrs4ITs7jSiyWbu1CGFgHyP
=lW+y
-----END PGP SIGNATURE-----

review: Needs Fixing

[Vincent Ladeuil (vila)]

> I'm pretty sure the module isn't called "patiendiff".

Indeed.

Damn typos, damn lack of tests :-/

Fixed and tested manually.

[lp:~vila/bzr-guess/690563-lazy-import]

6. By Vincent Ladeuil on 2010-12-15

Fix typo.

[Martin Pool (mbp)]

review: Approve

=== modified file '__init__.py'
--- __init__.py	2009-07-26 14:16:55 +0000
+++ __init__.py	2010-12-15 16:47:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,8 +18,16 @@
 
 
 import traceback
-from bzrlib import commands, patiencediff, ui
-
+from bzrlib import (
+    commands,
+    lazy_import,
+    )
+lazy_import.lazy_import(globals(), """
+from bzrlib import (
+    patiencediff,
+    ui,
+    )
+""")
 
 # Overrides for common mispellings that heuristics get wrong
 _overrides = {