← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ui/text.py

  • Committer: Martin
  • Date: 2011-05-21 16:29:38 UTC
  • mto: This revision was merged to the branch mainline in revision 5907.
  • Revision ID: gzlist@googlemail.com-20110521162938-1vrw3hp0197l3vrl
Add tests for non-ascii conflict serialisation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ui/text.py
114
114
                password = password[:-1]
115
115
        return password
116
116
 
117
 
    def get_password(self, prompt=u'', **kwargs):
 
117
    def get_password(self, prompt='', **kwargs):
118
118
        """Prompt the user for a password.
119
119
 
120
120
        :param prompt: The prompt to present the user
198
198
        :param kwargs: Dictionary of arguments to insert into the prompt,
199
199
            to allow UIs to reformat the prompt.
200
200
        """
201
 
        if type(prompt) != unicode:
202
 
            raise ValueError("prompt %r not a unicode string" % prompt)
203
201
        if kwargs:
204
202
            # See <https://launchpad.net/bugs/365891>
205
203
            prompt = prompt % kwargs