Rev 5756: (jelmer) Use lazy imports in bzrlib.ignores. (Jelmer Vernooij) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5756 [merge]
revision-id: pqm at pqm.ubuntu.com-20110405124506-adr9eam4dhbdz1fj
parent: pqm at pqm.ubuntu.com-20110405115356-5d6k2moisuap7bi6
parent: jelmer at samba.org-20110401131643-5b68hpbztri132i8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-04-05 12:45:06 +0000
message:
  (jelmer) Use lazy imports in bzrlib.ignores. (Jelmer Vernooij)
modified:
  bzrlib/ignores.py              ignores.py-20060712153832-2von9l0t7p43ixsv-1
  bzrlib/tests/test_import_tariff.py test_import_tariff.p-20100207155145-ff9infp7goncs7zh-1
=== modified file 'bzrlib/ignores.py'
--- a/bzrlib/ignores.py	2010-09-22 09:30:26 +0000
+++ b/bzrlib/ignores.py	2011-03-31 15:20:57 +0000
@@ -21,6 +21,8 @@
 from cStringIO import StringIO
 
 import bzrlib
+from bzrlib.lazy_import import lazy_import
+lazy_import(globals(), """
 from bzrlib import (
     atomicfile,
     config,
@@ -28,6 +30,7 @@
     )
 
 from trace import warning
+""")
 
 # ~/.bazaar/ignore will be filled out using
 # this ignore list, if it does not exist

=== modified file 'bzrlib/tests/test_import_tariff.py'
--- a/bzrlib/tests/test_import_tariff.py	2011-04-01 14:12:50 +0000
+++ b/bzrlib/tests/test_import_tariff.py	2011-04-05 12:45:06 +0000
@@ -96,6 +96,7 @@
         # 'st' in a default format working tree shouldn't need many modules
         self.make_branch_and_tree('.')
         self.run_command_check_imports(['st'], [
+            'bzrlib.atomicfile',
             'bzrlib.bugtracker',
             'bzrlib.bundle.commands',
             'bzrlib.cmd_version_info',