← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2011-01-27 15:58:36 UTC
  • mfrom: (5609.2.5 2.3)
  • mto: This revision was merged to the branch mainline in revision 5635.
  • Revision ID: v.ladeuil+lp@free.fr-20110127155836-hoyxs53z42jh3ezm
Merge 2.3 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_directory.py
24
24
    debug,
25
25
    errors,
26
26
    trace,
27
 
    )
28
 
from bzrlib.transport import (
29
 
    get_transport,
30
 
    register_urlparse_netloc_protocol,
 
27
    transport,
31
28
    )
32
29
 
33
30
from bzrlib.plugins.launchpad.lp_registration import (
37
34
 
38
35
# As bzrlib.transport.remote may not be loaded yet, make sure bzr+ssh
39
36
# is counted as a netloc protocol.
40
 
register_urlparse_netloc_protocol('bzr+ssh')
41
 
register_urlparse_netloc_protocol('lp')
 
37
transport.register_urlparse_netloc_protocol('bzr+ssh')
 
38
transport.register_urlparse_netloc_protocol('lp')
42
39
 
43
40
_ubuntu_series_shortcuts = {
44
41
    'n': 'natty',
147
144
            else:
148
145
                # Use the URL if we can create a transport for it.
149
146
                try:
150
 
                    get_transport(url)
 
147
                    transport.get_transport(url)
151
148
                except (errors.PathError, errors.TransportError):
152
149
                    pass
153
150
                else: