Merge lp:~maxb/bzr/2.2-launchpadlib-service-root-api-compat into lp:bzr/2.2

[Max Bowsher]

Merge 2.1 into 2.2 for lp:707075, and add NEWS entry.

[Vincent Ladeuil (vila)]

Please clarify the NEWS entry from:

<maxb> The bug always existed in the url config within bzr for talking to lp production - but not edge. Therefore, it only became a problem when we switched to talking to production

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2011-01-20 21:40:17 +0000
+++ NEWS	2011-02-02 10:53:44 +0000
@@ -19,6 +19,12 @@
 Bug Fixes
 *********
 
+* Fix communications with the Launchpad web service when using
+  launchpadlib >= 1.5.5.  This was a latent bug in bzr's communication
+  with Launchpad's production instance, which only became a problem when
+  the default instance was switched from edge to production in bzr 2.2.3.
+  (Max Bowsher, #707075)
+
 Improvements
 ************
 

=== modified file 'bzrlib/plugins/launchpad/lp_api.py'
--- bzrlib/plugins/launchpad/lp_api.py	2010-11-26 18:13:30 +0000
+++ bzrlib/plugins/launchpad/lp_api.py	2011-02-02 10:53:44 +0000
@@ -73,10 +73,25 @@
             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': 'https://api.launchpad.net/beta/',
+    'production': STAGING_SERVICE_ROOT.replace('api.staging.launchpad.net',
+        'api.launchpad.net'),
     'staging': STAGING_SERVICE_ROOT,
-    'dev': 'https://api.launchpad.dev/beta/',
+    'dev': STAGING_SERVICE_ROOT.replace('api.staging.launchpad.net',
+        'api.launchpad.dev'),
     }