~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Vincent Ladeuil
  • Date: 2009-04-27 16:10:10 UTC
  • mto: (4310.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4311.
  • Revision ID: v.ladeuil+lp@free.fr-20090427161010-7swfzeagf63cpixd
Fix bug #367726 by reverting some default user handling introduced
while fixing bug #256612.

* bzrlib/transport/ssh.py:
(_paramiko_auth): Explicitly use getpass.getuser() as default
user.

* bzrlib/transport/ftp/_gssapi.py:
(GSSAPIFtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/transport/ftp/__init__.py:
(FtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/tests/test_sftp_transport.py:
(TestUsesAuthConfig.test_sftp_is_none_if_no_config)
(TestUsesAuthConfig.test_sftp_doesnt_prompt_username): Revert to
None as the default user.

* bzrlib/tests/test_remote.py:
(TestRemoteSSHTransportAuthentication): The really offending one:
revert to None as the default user.

* bzrlib/tests/test_config.py:
(TestAuthenticationConfig.test_username_default_no_prompt): Update
test (and some PEP8).

* bzrlib/smtp_connection.py:
(SMTPConnection._authenticate): Revert to None as the default
user.

* bzrlib/plugins/launchpad/account.py:
(_get_auth_user): Revert default value handling.

* bzrlib/config.py:
(AuthenticationConfig.get_user): Fix doc-string. Leave default
value handling to callers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2850
2850
    pass
2851
2851
 
2852
2852
 
2853
 
class NotATerminal(BzrError):
2854
 
 
2855
 
    _fmt = 'Unable to ask for a password without real terminal.'
2856
 
 
2857
 
 
2858
2853
class UnableEncodePath(BzrError):
2859
2854
 
2860
2855
    _fmt = ('Unable to encode %(kind)s path %(path)r in '
2965
2960
        BzrError.__init__(self, invalid_id=invalid_id)
2966
2961
 
2967
2962
 
 
2963
class JailBreak(BzrError):
 
2964
 
 
2965
    _fmt = "An attempt to access a url outside the server jail was made: '%(url)s'."
 
2966
 
 
2967
    def __init__(self, url):
 
2968
        BzrError.__init__(self, url=url)
 
2969
 
 
2970
 
2968
2971
class UserAbort(BzrError):
2969
2972
 
2970
2973
    _fmt = 'The user aborted the operation.'