← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-10 16:25:28 UTC
  • mfrom: (5020.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100210162528-00g29u0ex6vzv914
(gerard) Update performs two merges in a more logical order but stop
        on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/account.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007, 2008 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 (
24
 
    errors,
25
 
    trace,
26
 
    transport,
27
 
    )
 
23
from bzrlib import errors, trace
28
24
from bzrlib.config import AuthenticationConfig, GlobalConfig
 
25
from bzrlib.transport import get_transport
29
26
 
30
27
 
31
28
LAUNCHPAD_BASE = 'https://launchpad.net/'
100
97
    uploaded SSH keys.
101
98
    """
102
99
    if _transport is None:
103
 
        _transport = transport.get_transport(LAUNCHPAD_BASE)
 
100
        _transport = get_transport(LAUNCHPAD_BASE)
104
101
 
105
102
    try:
106
103
        data = _transport.get_bytes('~%s/+sshkeys' % username)