~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ui/text.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
75
75
        """
76
76
        prompt = (prompt % kwargs).encode(sys.stdout.encoding, 'replace')
77
77
        prompt += ': '
78
 
        try:
79
 
            return getpass.getpass(prompt)
80
 
        except KeyboardInterrupt:
81
 
            return None
 
78
        # There's currently no way to say 'i decline to enter a password'
 
79
        # as opposed to 'my password is empty' -- does it matter?
 
80
        return getpass.getpass(prompt)
82
81
 
83
82
    def nested_progress_bar(self):
84
83
        """Return a nested progress bar.