← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/account.py

(vila) Make all transport put_bytes() raises TypeError when given unicode
 strings rather than bytes (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/account.py
1
 
# Copyright (C) 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2007-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
than once for each place that needs to take it into account.
21
21
"""
22
22
 
23
 
from bzrlib import errors, trace
24
 
from bzrlib.config import AuthenticationConfig, GlobalConfig
25
 
from bzrlib.transport import get_transport
 
23
from __future__ import absolute_import
26
24
 
 
25
from bzrlib import (
 
26
    errors,
 
27
    trace,
 
28
    transport,
 
29
    )
 
30
from bzrlib.config import AuthenticationConfig, GlobalStack
 
31
from bzrlib.i18n import gettext
27
32
 
28
33
LAUNCHPAD_BASE = 'https://launchpad.net/'
29
34
 
50
55
        disagree about username.
51
56
    """
52
57
    if _config is None:
53
 
        _config = GlobalConfig()
 
58
        _config = GlobalStack()
54
59
 
55
 
    username = _config.get_user_option('launchpad_username')
 
60
    username = _config.get('launchpad_username')
56
61
    if username is not None:
57
62
        auth = AuthenticationConfig()
58
63
        auth_username = _get_auth_user(auth)
59
64
        # Auto-upgrading
60
65
        if auth_username is None:
61
 
            trace.note('Setting ssh/sftp usernames for launchpad.net.')
 
66
            trace.note(gettext('Setting ssh/sftp usernames for launchpad.net.'))
62
67
            _set_auth_user(username, auth)
63
68
        elif auth_username != username:
64
69
            raise MismatchedUsernames()
67
72
 
68
73
def _set_global_option(username, _config=None):
69
74
    if _config is None:
70
 
        _config = GlobalConfig()
71
 
    _config.set_user_option('launchpad_username', username)
 
75
        _config = GlobalStack()
 
76
    _config.set('launchpad_username', username)
72
77
 
73
78
 
74
79
def set_lp_login(username, _config=None):
97
102
    uploaded SSH keys.
98
103
    """
99
104
    if _transport is None:
100
 
        _transport = get_transport(LAUNCHPAD_BASE)
 
105
        _transport = transport.get_transport_from_url(LAUNCHPAD_BASE)
101
106
 
102
107
    try:
103
108
        data = _transport.get_bytes('~%s/+sshkeys' % username)