/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/plugins/launchpad/lp_directory.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
from urlparse import urlsplit
22
22
import xmlrpclib
23
23
 
24
 
from bzrlib import (
 
24
from ... import (
25
25
    debug,
26
26
    errors,
27
27
    trace,
28
28
    transport,
29
29
    )
30
 
from bzrlib.i18n import gettext
 
30
from ...i18n import gettext
31
31
 
32
 
from bzrlib.plugins.launchpad.lp_registration import (
 
32
from .lp_registration import (
33
33
    LaunchpadService, ResolveLaunchpadPathRequest)
34
 
from bzrlib.plugins.launchpad.account import get_lp_login
35
 
 
36
 
 
37
 
# As bzrlib.transport.remote may not be loaded yet, make sure bzr+ssh
 
34
from .account import get_lp_login
 
35
 
 
36
 
 
37
# As breezy.transport.remote may not be loaded yet, make sure bzr+ssh
38
38
# is counted as a netloc protocol.
39
39
transport.register_urlparse_netloc_protocol('bzr+ssh')
40
40
transport.register_urlparse_netloc_protocol('lp')
98
98
        resolve = _request_factory(path)
99
99
        try:
100
100
            result = resolve.submit(service)
101
 
        except xmlrpclib.Fault, fault:
 
101
        except xmlrpclib.Fault as fault:
102
102
            raise errors.InvalidURL(
103
103
                path=url, extra=fault.faultString)
104
104
        return result