Merge lp:~leonardr/launchpadlib/edge-fakery-for-maverick into lp:launchpadlib

[Leonard Richardson]

This branch backports my "fake edge" code (https://code.launchpad.net/~leonardr/launchpadlib/fake-edge/+merge/49651) to the version of launchpadlib found in Maverick.

[Graham Binns (gmb)]

There are merge conflicts here; let me know when they're taken care of (or paste me a clean diff if they're spurious).

review: Needs Fixing (code)

Unmerged revisions

90. By Leonard Richardson on 2011-02-14

Ported the edge->staging code to the version of launchpadlib in Maverick.

=== modified file 'src/launchpadlib/launchpad.py'
--- src/launchpadlib/launchpad.py	2011-02-07 20:08:28 +0000
+++ src/launchpadlib/launchpad.py	2011-02-14 15:58:24 +0000
@@ -44,11 +44,21 @@
     )
 from launchpadlib import uris
 
+<<<<<<< TREE
 
 # Import some constants for backwards compatibility. This way, old
 # scripts that have 'from launchpad import STAGING_SERVICE_ROOT' will still
+=======
+# Set some constants for backwards compatibility. This way, old
+# scripts that have 'from launchpad import EDGE_SERVICE_ROOT' will still
+>>>>>>> MERGE-SOURCE
 # work.
+<<<<<<< TREE
 from launchpadlib.uris import STAGING_SERVICE_ROOT
+=======
+STAGING_SERVICE_ROOT = 'staging'
+EDGE_SERVICE_ROOT = 'edge'
+>>>>>>> MERGE-SOURCE
 OAUTH_REALM = 'https://api.launchpad.net'
 
 

=== modified file 'src/launchpadlib/tests/test_launchpad.py'
--- src/launchpadlib/tests/test_launchpad.py	2011-01-18 21:57:09 +0000
+++ src/launchpadlib/tests/test_launchpad.py	2011-02-14 15:58:24 +0000
@@ -24,9 +24,13 @@
 import stat
 import tempfile
 import unittest
+<<<<<<< TREE
 import warnings
 
 from lazr.restfulclient.resource import ServiceRoot
+=======
+import warnings
+>>>>>>> MERGE-SOURCE
 
 from launchpadlib.credentials import (
     AccessToken,
@@ -75,6 +79,22 @@
         self.assertEqual(sorted(uris.service_roots.keys()), self.aliases)
         self.assertEqual(sorted(uris.web_roots.keys()), self.aliases)
 
+    def test_edge(self):
+        # 'edge' is the same as 'production', since the edge server no
+        # longer exists.
+        with warnings.catch_warnings(record=True) as caught:
+            self.assertEqual(uris.lookup_service_root('edge'),
+                             uris.lookup_service_root('production'))
+
+            self.assertEqual(uris.lookup_web_root('edge'),
+                             uris.lookup_web_root('production'))
+
+            self.assertEqual(len(caught), 1)
+            warning, = caught
+            self.assertTrue(issubclass(warning.category, DeprecationWarning))
+            self.assertTrue("no longer exists" in warning.message.message)
+
+
     def test_lookups(self):
         """Ensure that short service names turn into long service names."""
 

=== modified file 'src/launchpadlib/uris.py'
--- src/launchpadlib/uris.py	2011-01-18 21:57:09 +0000
+++ src/launchpadlib/uris.py	2011-02-14 15:58:24 +0000
@@ -28,17 +28,29 @@
     ]
 
 from urlparse import urlparse
+<<<<<<< TREE
 from lazr.uri import URI
+=======
+import warnings
+>>>>>>> MERGE-SOURCE
 
 LPNET_SERVICE_ROOT = 'https://api.launchpad.net/'
+<<<<<<< TREE
 QASTAGING_SERVICE_ROOT = 'https://api.qastaging.launchpad.net/'
+=======
+EDGE_SERVICE_ROOT = 'edge'
+>>>>>>> MERGE-SOURCE
 STAGING_SERVICE_ROOT = 'https://api.staging.launchpad.net/'
 DEV_SERVICE_ROOT = 'https://api.launchpad.dev/'
 DOGFOOD_SERVICE_ROOT = 'https://api.dogfood.launchpad.net/'
 TEST_DEV_SERVICE_ROOT = 'http://api.launchpad.dev:8085/'
 
 LPNET_WEB_ROOT = 'https://launchpad.net/'
+<<<<<<< TREE
 QASTAGING_WEB_ROOT = 'https://qastaging.launchpad.net/'
+=======
+EDGE_WEB_ROOT = 'edge'
+>>>>>>> MERGE-SOURCE
 STAGING_WEB_ROOT = 'https://staging.launchpad.net/'
 DEV_WEB_ROOT = 'https://launchpad.dev/'
 DOGFOOD_WEB_ROOT = 'https://dogfood.launchpad.net/'
@@ -47,7 +59,11 @@
 
 service_roots = dict(
     production=LPNET_SERVICE_ROOT,
+<<<<<<< TREE
     qastaging=QASTAGING_SERVICE_ROOT,
+=======
+    edge=LPNET_SERVICE_ROOT,
+>>>>>>> MERGE-SOURCE
     staging=STAGING_SERVICE_ROOT,
     dogfood=DOGFOOD_SERVICE_ROOT,
     dev=DEV_SERVICE_ROOT,
@@ -57,7 +73,11 @@
 
 web_roots = dict(
     production=LPNET_WEB_ROOT,
+<<<<<<< TREE
     qastaging=QASTAGING_WEB_ROOT,
+=======
+    edge=LPNET_WEB_ROOT,
+>>>>>>> MERGE-SOURCE
     staging=STAGING_WEB_ROOT,
     dogfood=DOGFOOD_WEB_ROOT,
     dev=DEV_WEB_ROOT,
@@ -67,6 +87,9 @@
 
 def _dereference_alias(root, aliases):
     """Dereference what might a URL or an alias for a URL."""
+    if root == 'edge':
+        warnings.warn(("Launchpad edge server no longer exists. "
+                       "Using 'production' instead."), DeprecationWarning)
     if root in aliases:
         return aliases[root]