← 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: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_directory.py
17
17
 
18
18
"""Directory lookup that uses Launchpad."""
19
19
 
20
 
from urlparse import urlsplit, urlunsplit
 
20
from urlparse import urlsplit
21
21
import xmlrpclib
22
22
 
23
23
from bzrlib import (
24
24
    debug,
25
25
    errors,
26
26
    trace,
27
 
    urlutils,
28
27
    )
29
28
from bzrlib.transport import (
30
29
    get_transport,