/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to setup.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:
setup.py
1
 
#!/usr/bin/env python
2
 
 
3
 
from info import *
4
 
 
5
 
if __name__ == '__main__':
6
 
    from distutils.core import setup
7
 
    version = bzr_plugin_version[:3]
8
 
    version_string = ".".join([str(x) for x in version])
9
 
 
10
 
    setup(name='bzr-git',
11
 
          description='Support for Git branches in Bazaar',
12
 
          keywords='plugin bzr git bazaar',
13
 
          version=version_string,
14
 
          url='http://bazaar-vcs.org/BzrForeignBranches/Git',
15
 
          license='GPL',
16
 
          maintainer='Jelmer Vernooij',
17
 
          maintainer_email='jelmer@samba.org',
18
 
          long_description="""
19
 
          This plugin adds limited support for checking out and viewing
20
 
          Git branches in Bazaar.
21
 
          """,
22
 
          package_dir={'bzrlib.plugins.git':'.'},
23
 
          packages=['bzrlib.plugins.git',
24
 
                    'bzrlib.plugins.git.tests'],
25
 
          scripts=['bzr-receive-pack', 'bzr-upload-pack'],
26
 
          )