Rev 5114: Merge additional fixes for bug #583667 from 2.1 in file:///home/vila/src/bzr/bugs/583667-lp-no-edge-2.2/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/583667-lp-no-edge-2.2/

------------------------------------------------------------
revno: 5114 [merge]
revision-id: v.ladeuil+lp at free.fr-20101126181330-bwt1a6dx9il08kbt
parent: v.ladeuil+lp at free.fr-20101126173355-f3v8vbium7g1y9tn
parent: v.ladeuil+lp at free.fr-20101126181001-usykban3mhatv9a2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 583667-lp-no-edge-2.2
timestamp: Fri 2010-11-26 19:13:30 +0100
message:
  Merge additional fixes for bug #583667 from 2.1
modified:
  bzrlib/plugins/launchpad/lp_api.py lp_api.py-20090704082908-79il6zl4gugwl3wz-1
-------------- next part --------------
=== modified file 'bzrlib/plugins/launchpad/lp_api.py'
--- a/bzrlib/plugins/launchpad/lp_api.py	2010-03-05 08:55:12 +0000
+++ b/bzrlib/plugins/launchpad/lp_api.py	2010-11-26 18:13:30 +0000
@@ -43,7 +43,6 @@
     raise errors.DependencyNotPresent('launchpadlib', e)
 
 from launchpadlib.launchpad import (
-    EDGE_SERVICE_ROOT,
     STAGING_SERVICE_ROOT,
     Launchpad,
     )
@@ -76,7 +75,6 @@
 
 LAUNCHPAD_API_URLS = {
     'production': 'https://api.launchpad.net/beta/',
-    'edge': EDGE_SERVICE_ROOT,
     'staging': STAGING_SERVICE_ROOT,
     'dev': 'https://api.launchpad.dev/beta/',
     }
@@ -85,8 +83,8 @@
 def _get_api_url(service):
     """Return the root URL of the Launchpad API.
 
-    e.g. For the 'edge' Launchpad service, this function returns
-    launchpadlib.launchpad.EDGE_SERVICE_ROOT.
+    e.g. For the 'staging' Launchpad service, this function returns
+    launchpadlib.launchpad.STAGING_SERVICE_ROOT.
 
     :param service: A `LaunchpadService` object.
     :return: A URL as a string.