← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ssh.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-16 13:39:39 UTC
  • mto: (5923.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5925.
  • Revision ID: jelmer@samba.org-20110516133939-8u1pc9utas3uw1lt
https://launchpad.net/bugs/592083
Require a unicode prompt to be passed into all methods that prompt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ssh.py
573
573
        return True
574
574
    except paramiko.PasswordRequiredException:
575
575
        password = ui.ui_factory.get_password(
576
 
            prompt='SSH %(filename)s password', filename=filename)
 
576
            prompt=u'SSH %(filename)s password',
 
577
            filename=filename.decode(osutils._fs_enc))
577
578
        try:
578
579
            key = pkey_class.from_private_key_file(filename, password)
579
580
            paramiko_transport.auth_publickey(username, key)