/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_directory.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
"""Directory lookup that uses Launchpad."""
63
63
                 _request_factory=ResolveLaunchpadPathRequest,
64
64
                 _lp_login=None):
65
65
        """Resolve the base URL for this transport."""
 
66
        service = LaunchpadService.for_url(url)
66
67
        result = urlsplit(url)
67
 
        # Perform an XMLRPC request to resolve the path
68
 
        lp_instance = result[1]
69
 
        if lp_instance == '':
70
 
            lp_instance = None
71
 
        elif lp_instance not in LaunchpadService.LAUNCHPAD_INSTANCE:
72
 
            raise errors.InvalidURL(path=url)
73
68
        resolve = _request_factory(result[2].strip('/'))
74
 
        service = LaunchpadService(lp_instance=lp_instance)
75
69
        try:
76
70
            result = resolve.submit(service)
77
71
        except xmlrpclib.Fault, fault:
79
73
                path=url, extra=fault.faultString)
80
74
 
81
75
        if 'launchpad' in debug.debug_flags:
82
 
            trace.mutter("resolve_lp_path(%r) == %r", path, result)
 
76
            trace.mutter("resolve_lp_path(%r) == %r", url, result)
83
77
 
84
78
        if _lp_login is None:
85
79
            _lp_login = get_lp_login()