← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ui/text.py

  • Committer: Robert Collins
  • Date: 2007-04-23 02:29:35 UTC
  • mfrom: (2441 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070423022935-9hhongamvk6bfdso
Resolve conflicts with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ui/text.py
27
27
 
28
28
from bzrlib import (
29
29
    progress,
 
30
    osutils,
30
31
    )
31
32
""")
32
33
 
63
64
 
64
65
    def prompt(self, prompt):
65
66
        """Emit prompt on the CLI."""
66
 
        self.stdout.write(prompt + "? [y/n]:")
 
67
        self.stdout.write(prompt)
67
68
        
68
69
    @deprecated_method(zero_eight)
69
70
    def progress_bar(self):
72
73
        # bar depending on what we think of the terminal
73
74
        return progress.ProgressBar()
74
75
 
75
 
    def get_password(self, prompt='', **kwargs):
76
 
        """Prompt the user for a password.
77
 
 
78
 
        :param prompt: The prompt to present the user
79
 
        :param kwargs: Arguments which will be expanded into the prompt.
80
 
                       This lets front ends display different things if
81
 
                       they so choose.
82
 
        :return: The password string, return None if the user 
83
 
                 canceled the request.
84
 
        """
85
 
        prompt = (prompt % kwargs).encode(sys.stdout.encoding, 'replace')
86
 
        prompt += ': '
87
 
        # There's currently no way to say 'i decline to enter a password'
88
 
        # as opposed to 'my password is empty' -- does it matter?
89
 
        return getpass.getpass(prompt)
90
 
 
91
76
    def nested_progress_bar(self):
92
77
        """Return a nested progress bar.
93
78