← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ui/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2011-05-31 21:08:52 UTC
  • mfrom: (5743.12.19 config-options)
  • mto: This revision was merged to the branch mainline in revision 5945.
  • Revision ID: v.ladeuil+lp@free.fr-20110531210852-0uyfsjkws5zbfs8m
Merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ui/__init__.py
204
204
        """
205
205
        return self.get_boolean(prompt % prompt_kwargs)
206
206
 
207
 
    def get_password(self, prompt='', **kwargs):
 
207
    def get_password(self, prompt=u'', **kwargs):
208
208
        """Prompt the user for a password.
209
209
 
210
 
        :param prompt: The prompt to present the user
 
210
        :param prompt: The prompt to present the user (must be unicode)
211
211
        :param kwargs: Arguments which will be expanded into the prompt.
212
212
                       This lets front ends display different things if
213
213
                       they so choose.
483
483
    def get_integer(self, prompt):
484
484
        return self.responses.pop(0)
485
485
 
486
 
    def get_password(self, prompt='', **kwargs):
 
486
    def get_password(self, prompt=u'', **kwargs):
487
487
        return self.responses.pop(0)
488
488
 
489
489
    def get_username(self, prompt, **kwargs):