← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_annotator_py.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-10-13 06:08:53 UTC
  • mfrom: (4737.1.1 merge-2.0-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20091013060853-erk2aaj80fnkrv25
(andrew) Merge lp:bzr/2.0 into lp:bzr, including fixes for #322807,
        #389413, #402623 and documentation improvements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_annotator_py.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
"""Functionality for doing annotations in the 'optimal' way"""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
from bzrlib.lazy_import import lazy_import
22
20
lazy_import(globals(), """
23
 
from bzrlib import (
24
 
    annotate, # Must be lazy to avoid circular importing
25
 
    graph as _mod_graph,
26
 
    patiencediff,
27
 
    )
 
21
from bzrlib import annotate # Must be lazy to avoid circular importing
28
22
""")
29
23
from bzrlib import (
30
24
    errors,
 
25
    graph as _mod_graph,
31
26
    osutils,
 
27
    patiencediff,
32
28
    ui,
33
29
    )
34
30