Merge lp:~leonardr/launchpadlib/death-to-edge into lp:launchpadlib

[Leonard Richardson]

This branch removes all references to edge from launchpadlib. Edge is broken for launchpadlib right now, and any application that's trying to connect to edge is already deprecated. It's time to remove edge from launchpadlib, if only to give our users comprehensible error messages.

[Leonard Richardson (leonardr)]

Self-reviewed following discussion with benji and wgrant.

=== modified file 'src/launchpadlib/NEWS.txt'
--- src/launchpadlib/NEWS.txt	2011-01-14 16:09:39 +0000
+++ src/launchpadlib/NEWS.txt	2011-01-18 22:03:28 +0000
@@ -2,8 +2,10 @@
 NEWS for launchpadlib
 =====================
 
-Unreleased
-==========
+1.9.4 (2010-01-18)
+==================
+
+- Removed references to the 'edge' service root, which is being phased out.
 
 - Fixed a minor bug in the upload_release_tarball contrib script which
   was causing tarballs to be uploaded with the wrong media type.

=== modified file 'src/launchpadlib/launchpad.py'
--- src/launchpadlib/launchpad.py	2011-01-07 18:01:06 +0000
+++ src/launchpadlib/launchpad.py	2011-01-18 22:03:28 +0000
@@ -45,9 +45,9 @@
 
 
 # Import some constants for backwards compatibility. This way, old
-# scripts that have 'from launchpad import EDGE_SERVICE_ROOT' will still
+# scripts that have 'from launchpad import STAGING_SERVICE_ROOT' will still
 # work.
-from launchpadlib.uris import EDGE_SERVICE_ROOT, STAGING_SERVICE_ROOT
+from launchpadlib.uris import STAGING_SERVICE_ROOT
 OAUTH_REALM = 'https://api.launchpad.net'
 
 

=== modified file 'src/launchpadlib/tests/test_launchpad.py'
--- src/launchpadlib/tests/test_launchpad.py	2011-01-10 14:34:03 +0000
+++ src/launchpadlib/tests/test_launchpad.py	2011-01-18 22:03:28 +0000
@@ -68,7 +68,7 @@
 
     def setUp(self):
         self.aliases = sorted(
-            ['production', 'edge', 'qastaging', 'staging', 'dogfood', 'dev', 'test_dev'])
+            ['production', 'qastaging', 'staging', 'dogfood', 'dev', 'test_dev'])
 
     def test_short_names(self):
         # Ensure the short service names are all supported.

=== modified file 'src/launchpadlib/uris.py'
--- src/launchpadlib/uris.py	2010-12-03 19:44:47 +0000
+++ src/launchpadlib/uris.py	2011-01-18 22:03:28 +0000
@@ -16,8 +16,8 @@
 
 """Launchpad-specific URIs and convenience lookup functions.
 
-The code in this module lets users say "edge" when they mean
-"https://api.edge.launchpad.net/".
+The code in this module lets users say "staging" when they mean
+"https://api.staging.launchpad.net/".
 """
 
 __metaclass__ = type
@@ -31,7 +31,6 @@
 from lazr.uri import URI
 
 LPNET_SERVICE_ROOT = 'https://api.launchpad.net/'
-EDGE_SERVICE_ROOT = 'https://api.edge.launchpad.net/'
 QASTAGING_SERVICE_ROOT = 'https://api.qastaging.launchpad.net/'
 STAGING_SERVICE_ROOT = 'https://api.staging.launchpad.net/'
 DEV_SERVICE_ROOT = 'https://api.launchpad.dev/'
@@ -39,7 +38,6 @@
 TEST_DEV_SERVICE_ROOT = 'http://api.launchpad.dev:8085/'
 
 LPNET_WEB_ROOT = 'https://launchpad.net/'
-EDGE_WEB_ROOT = 'https://edge.launchpad.net/'
 QASTAGING_WEB_ROOT = 'https://qastaging.launchpad.net/'
 STAGING_WEB_ROOT = 'https://staging.launchpad.net/'
 DEV_WEB_ROOT = 'https://launchpad.dev/'
@@ -49,7 +47,6 @@
 
 service_roots = dict(
     production=LPNET_SERVICE_ROOT,
-    edge=EDGE_SERVICE_ROOT,
     qastaging=QASTAGING_SERVICE_ROOT,
     staging=STAGING_SERVICE_ROOT,
     dogfood=DOGFOOD_SERVICE_ROOT,
@@ -60,7 +57,6 @@
 
 web_roots = dict(
     production=LPNET_WEB_ROOT,
-    edge=EDGE_WEB_ROOT,
     qastaging=QASTAGING_WEB_ROOT,
     staging=STAGING_WEB_ROOT,
     dogfood=DOGFOOD_WEB_ROOT,
@@ -87,7 +83,7 @@
 def lookup_service_root(service_root):
     """Dereference an alias to a service root.
 
-    A recognized server alias such as "edge" gets turned into the
+    A recognized server alias such as "staging" gets turned into the
     appropriate URI. A URI gets returned as is. Any other string raises a
     ValueError.
     """
@@ -97,7 +93,7 @@
 def lookup_web_root(web_root):
     """Dereference an alias to a website root.
 
-    A recognized server alias such as "edge" gets turned into the
+    A recognized server alias such as "staging" gets turned into the
     appropriate URI. A URI gets returned as is. Any other string raises a
     ValueError.
     """