← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ui/__init__.py

[merge] bzr.dev 2255, resolve conflicts, update copyrights

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ui/__init__.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
30
30
 
31
31
import sys
32
32
 
33
 
import bzrlib.progress
 
33
from bzrlib.lazy_import import lazy_import
 
34
lazy_import(globals(), """
 
35
from bzrlib import (
 
36
    progress,
 
37
    )
 
38
""")
 
39
 
34
40
from bzrlib.symbol_versioning import (deprecated_method, zero_eight)
35
41
 
36
42
 
65
71
    def nested_progress_bar(self):
66
72
        """Return a nested progress bar.
67
73
 
68
 
        When the bar has been finished with, it should be released bu calling
 
74
        When the bar has been finished with, it should be released by calling
69
75
        bar.finished().
70
76
        """
71
77
        raise NotImplementedError(self.nested_progress_bar)
118
124
    @deprecated_method(zero_eight)
119
125
    def progress_bar(self):
120
126
        """See UIFactory.nested_progress_bar()."""
121
 
        return bzrlib.progress.DummyProgress()
 
127
        return progress.DummyProgress()
122
128
 
123
129
    def get_password(self, prompt='', **kwargs):
124
130
        return None
125
131
 
126
132
    def nested_progress_bar(self):
127
133
        if self._progress_bar_stack is None:
128
 
            self._progress_bar_stack = bzrlib.progress.ProgressBarStack(
129
 
                klass=bzrlib.progress.DummyProgress)
 
134
            self._progress_bar_stack = progress.ProgressBarStack(
 
135
                klass=progress.DummyProgress)
130
136
        return self._progress_bar_stack.get_nested()
131
137
 
132
138
    def clear_term(self):