Merge lp:~james-w/bzr-pqm/fix-service-roots into lp:bzr-pqm

[James Westby]

Hi,

This removes an XXX from jml and fixes a bug at the same time.

Since the multi-version change the hardcoded values for service
roots were incorrect.

The ones in launchpad.uris should be old enough that everyone has
that version.

Thanks,

James

[Martin Pool (mbp)]

review: Approve

=== modified file 'lpland.py'
--- lpland.py	2010-01-20 06:29:44 +0000
+++ lpland.py	2010-03-31 14:45:33 +0000
@@ -18,8 +18,10 @@
 
 import os
 
-from launchpadlib.launchpad import (
-    Launchpad, EDGE_SERVICE_ROOT, STAGING_SERVICE_ROOT)
+from launchpadlib.launchpad import Launchpad
+from launchpadlib.uris import (
+    DEV_SERVICE_ROOT, EDGE_SERVICE_ROOT,
+    LPNET_SERVICE_ROOT, STAGING_SERVICE_ROOT)
 from lazr.uri import URI
 from bzrlib import msgeditor
 from bzrlib.errors import BzrCommandError
@@ -27,13 +29,6 @@
 from bzrlib import smtp_connection
 
 
-# XXX: JonathanLange 2009-09-24: Both of these are available in more recent
-# versions of launchpadlib. When we start using such versions, we should
-# instead import these from launchpadlib.
-DEV_SERVICE_ROOT = 'https://api.launchpad.dev/beta/'
-LPNET_SERVICE_ROOT = 'https://api.launchpad.net/beta/'
-
-
 class MissingReviewError(Exception):
     """Raised when we try to get a review message without enough reviewers."""
 

=== modified file 'test_lpland.py'
--- test_lpland.py	2010-01-21 23:06:56 +0000
+++ test_lpland.py	2010-03-31 14:45:33 +0000
@@ -7,7 +7,9 @@
 
 import unittest
 
-from launchpadlib.launchpad import EDGE_SERVICE_ROOT, STAGING_SERVICE_ROOT
+from launchpadlib.uris import (
+    DEV_SERVICE_ROOT, EDGE_SERVICE_ROOT, LPNET_SERVICE_ROOT,
+    STAGING_SERVICE_ROOT)
 
 from bzrlib.plugins.pqm.lpland import (
     get_bazaar_host, get_bugs_clause, get_reviewer_clause,
@@ -169,8 +171,7 @@
     def test_dev_service(self):
         # The Bazaar host for the dev service is bazaar.launchpad.dev.
         self.assertEqual(
-            'bazaar.launchpad.dev',
-            get_bazaar_host('https://api.launchpad.dev/beta/'))
+            'bazaar.launchpad.dev', get_bazaar_host(DEV_SERVICE_ROOT))
 
     def test_edge_service(self):
         # The Bazaar host for the edge service is bazaar.launchpad.net, since
@@ -181,8 +182,7 @@
     def test_production_service(self):
         # The Bazaar host for the production service is bazaar.launchpad.net.
         self.assertEqual(
-            'bazaar.launchpad.net',
-            get_bazaar_host('https://api.launchpad.net/beta/'))
+            'bazaar.launchpad.net', get_bazaar_host(LPNET_SERVICE_ROOT))
 
     def test_staging_service(self):
         # The Bazaar host for the staging service is