← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

[merge] jam-integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/sftp.py
37
37
from bzrlib.trace import mutter, warning, error
38
38
from bzrlib.transport import Transport, register_transport
39
39
from bzrlib.osutils import pathjoin
40
 
from bzrlib.ui import ui_factory
 
40
import bzrlib.ui
41
41
 
42
42
try:
43
43
    import paramiko
731
731
            #self._password = None
732
732
 
733
733
        # give up and ask for a password
734
 
        password = ui_factory.get_password(prompt='SSH %(user)s@%(host)s password',
735
 
                                           user=username, host=self._host)
 
734
        password = bzrlib.ui.ui_factory.get_password(
 
735
                prompt='SSH %(user)s@%(host)s password',
 
736
                user=username, host=self._host)
736
737
        try:
737
738
            transport.auth_password(username, password)
738
739
        except paramiko.SSHException:
746
747
            transport.auth_publickey(username, key)
747
748
            return True
748
749
        except paramiko.PasswordRequiredException:
749
 
            password = ui_factory.get_password(prompt='SSH %(filename)s password',
750
 
                                               filename=filename)
 
750
            password = bzrlib.ui.ui_factory.get_password(
 
751
                    prompt='SSH %(filename)s password',
 
752
                    filename=filename)
751
753
            try:
752
754
                key = pkey_class.from_private_key_file(filename, password)
753
755
                transport.auth_publickey(username, key)