~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_annotator_py.py

  • Committer: Andrew Bennetts
  • Date: 2010-06-04 03:09:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5280.
  • Revision ID: andrew.bennetts@canonical.com-20100604030935-4slnx0e8uh9b8yk6
lazy_import most things in merge.py; add a few representative modules to the import tariff tests; tweak a couple of other modules so that patiencediff is not necessarily imported; remove a bunch of unused imports from test_knit.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
from bzrlib.lazy_import import lazy_import
20
20
lazy_import(globals(), """
21
 
from bzrlib import annotate # Must be lazy to avoid circular importing
 
21
from bzrlib import (
 
22
    annotate, # Must be lazy to avoid circular importing
 
23
    graph as _mod_graph,
 
24
    patiencediff,
 
25
    )
22
26
""")
23
27
from bzrlib import (
24
28
    errors,
25
 
    graph as _mod_graph,
26
29
    osutils,
27
 
    patiencediff,
28
30
    ui,
29
31
    )
30
32