← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lazy_regex.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:
bzrlib/lazy_regex.py
22
22
 
23
23
import re
24
24
 
25
 
from bzrlib import errors
26
 
 
27
25
 
28
26
class LazyRegex(object):
29
27
    """A proxy around a real regex, which won't be compiled until accessed."""
60
58
 
61
59
    def _real_re_compile(self, *args, **kwargs):
62
60
        """Thunk over to the original re.compile"""
63
 
        try:
64
 
            return _real_re_compile(*args, **kwargs)
65
 
        except re.error, e:
66
 
            # raise InvalidPattern instead of re.error as this gives a
67
 
            # cleaner message to the user.
68
 
            raise errors.InvalidPattern('"' + args[0] + '" ' +str(e))
 
61
        return _real_re_compile(*args, **kwargs)
69
62
 
70
63
    def __getattr__(self, attr):
71
64
        """Return a member from the proxied regex object.