Merge lp:~abentley/bzr/lucid-launchpadlib into lp:bzr

[Aaron Bentley]

This branch updates the launchpad plugin to use launchpadlib 1.6.0, which
shipped in Lucid Lynx, instead of 1.5.1, which shipped with Karmic Koala. This
allows some crufty compatibility code to be dropped, and simplifies the implementation of lp:~abentley/bzr/find-proposal-revid.

[Martin Packman (gz)]

The mp is confused with lots of spurious changes as the merge target is lp:~abentley/bzr/dev rather than lp:bzr - was that deliberate?

General idea seems sensible though.

[Martin Packman (gz)]

Really wants a news entry, looks good otherwise.

review: Approve

=== modified file 'bzrlib/plugins/launchpad/lp_api.py'
--- bzrlib/plugins/launchpad/lp_api.py	2011-12-19 13:23:58 +0000
+++ bzrlib/plugins/launchpad/lp_api.py	2012-07-23 13:20:39 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010 Canonical Ltd
+# Copyright (C) 2009-2012 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -49,12 +49,12 @@
     STAGING_SERVICE_ROOT,
     Launchpad,
     )
-
+from launchpadlib import uris
 
 # Declare the minimum version of launchpadlib that we need in order to work.
-# 1.5.1 is the version of launchpadlib packaged in Ubuntu 9.10, the most
-# recent Ubuntu release at the time of writing.
-MINIMUM_LAUNCHPADLIB_VERSION = (1, 5, 1)
+# 1.6.0 is the version of launchpadlib packaged in Ubuntu 10.04, the most
+# recent Ubuntu LTS release supported on the desktop at the time of writing.
+MINIMUM_LAUNCHPADLIB_VERSION = (1, 6, 0)
 
 
 def get_cache_directory():
@@ -76,28 +76,14 @@
             installed_version, installed_version)
 
 
-# The older versions of launchpadlib only provided service root constants for
-# edge and staging, whilst newer versions drop edge. Therefore service root
-# URIs for which we do not always have constants are derived from the staging
-# one, which does always exist.
-#
-# It is necessary to derive, rather than use hardcoded URIs because
-# launchpadlib <= 1.5.4 requires service root URIs that end in a path of
-# /beta/, whilst launchpadlib >= 1.5.5 requires service root URIs with no path
-# info.
-#
-# Once we have a hard dependency on launchpadlib >= 1.5.4 we can replace all of
-# bzr's local knowledge of individual Launchpad instances with use of the
-# launchpadlib.uris module.
-LAUNCHPAD_API_URLS = {
-    'production': STAGING_SERVICE_ROOT.replace('api.staging.launchpad.net',
-        'api.launchpad.net'),
-    'qastaging': STAGING_SERVICE_ROOT.replace('api.staging.launchpad.net',
-        'api.qastaging.launchpad.net'),
-    'staging': STAGING_SERVICE_ROOT,
-    'dev': STAGING_SERVICE_ROOT.replace('api.staging.launchpad.net',
-        'api.launchpad.dev'),
-    }
+def lookup_service_root(service_root):
+    try:
+        return uris.lookup_service_root(service_root)
+    except ValueError:
+        if service_root != 'qastaging':
+            raise
+        staging_root = uris.lookup_service_root('staging')
+        return staging_root.replace('staging', 'qastaging')
 
 
 def _get_api_url(service):
@@ -114,8 +100,8 @@
     else:
         lp_instance = service._lp_instance
     try:
-        return LAUNCHPAD_API_URLS[lp_instance]
-    except KeyError:
+        return lookup_service_root(lp_instance)
+    except ValueError:
         raise InvalidLaunchpadInstance(lp_instance)
 
 
@@ -135,8 +121,8 @@
     launchpad = Launchpad.login_with(
         'bzr', _get_api_url(service), cache_directory, timeout=timeout,
         proxy_info=proxy_info)
-    # XXX: Work-around a minor security bug in launchpadlib 1.5.1, which would
-    # create this directory with default umask.
+    # XXX: Work-around a minor security bug in launchpadlib < 1.6.3, which
+    # would create this directory with default umask.
     osutils.chmod_if_possible(cache_directory, 0700)
     return launchpad
 
@@ -210,7 +196,7 @@
         if str(launchpad._root_uri) == STAGING_SERVICE_ROOT:
             return url.replace('bazaar.launchpad.net',
                                'bazaar.staging.launchpad.net')
-        elif str(launchpad._root_uri) == LAUNCHPAD_API_URLS['qastaging']:
+        elif str(launchpad._root_uri) == lookup_service_root('qastaging'):
             return url.replace('bazaar.launchpad.net',
                                'bazaar.qastaging.launchpad.net')
         return url