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

[Leonard Richardson]

This branch makes three small changes to launchpadlib that would be useful to backport to launchpadlib version 1.6.1, the version currently in Maverick.

1. It fixes a tiny test failure where the code expects launchpadlib to be using the 'beta' web service, even though the default is now '1.0'.
2. It introduces an alias for the qastaging Launchpad instance, so you can do Launchpad.login_with("my-app", "qastaging").
3. The "edge" Launchpad instance is deprecated. This branch introduces code that intercepts any attempt to access this instance, prints a deprecation warning, and uses the "production" instance instead.

The code is here: https://pastebin.canonical.com/43343/

[Leonard Richardson (leonardr)]

(Sorry for using the Canonical pastebin, but the Ubuntu one is down right now.)

[Robert Collins (lifeless)]

This would be good to land, but it has conflicts. I'm going to put it back into WIP for now.

Unmerged revisions

90. By Leonard Richardson on 2011-02-15

Backported the deprecation of edge and the creation of qastaging. Also fixed a random failing test.

=== modified file 'src/launchpadlib/tests/test_launchpad.py'
--- src/launchpadlib/tests/test_launchpad.py	2011-02-15 13:11:51 +0000
+++ src/launchpadlib/tests/test_launchpad.py	2011-02-15 14:03:00 +0000
@@ -25,9 +25,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,
@@ -69,6 +73,7 @@
 
     def setUp(self):
         self.aliases = sorted(
+<<<<<<< TREE
             ['production', 'qastaging', 'staging', 'dogfood', 'dev',
              'test_dev', 'edge'])
 
@@ -84,6 +89,23 @@
             warning, = caught
             self.assertTrue(issubclass(warning.category, DeprecationWarning))
             self.assertTrue("no longer exists" in warning.message.message)
+=======
+            ['production', 'edge', 'staging', 'qastaging', 'dogfood', 'dev',
+             'test_dev'])
+
+    @contextmanager
+    def edge_deprecation_error(self):
+        # Run some code and assert that a deprecation error was issued
+        # due to attempted access to the edge server.
+        with warnings.catch_warnings(record=True) as caught:
+            warnings.simplefilter("always")
+            yield
+
+            self.assertEqual(len(caught), 1)
+            warning, = caught
+            self.assertTrue(issubclass(warning.category, DeprecationWarning))
+            self.assertTrue("no longer exists" in warning.message.message)
+>>>>>>> MERGE-SOURCE
 
     def test_short_names(self):
         # Ensure the short service names are all supported.
@@ -479,10 +501,15 @@
         expected_arguments = dict(
             service_root=SERVICE_ROOT,
             cache=os.path.join(self.temp_dir, 'api.example.com', 'cache'),
+<<<<<<< TREE
             timeout=timeout,
             proxy_info=proxy_info,
             version=NoNetworkLaunchpad.DEFAULT_VERSION)
         self.assertEqual(launchpad.passed_in_args, expected_arguments)
+=======
+            version='1.0')
+        self.assertEqual(launchpad.passed_in_kwargs, expected_arguments)
+>>>>>>> MERGE-SOURCE
 
     def test_anonymous_login(self):
         """Test the anonymous login helper function."""

=== modified file 'src/launchpadlib/uris.py'
--- src/launchpadlib/uris.py	2011-02-15 12:03:58 +0000
+++ src/launchpadlib/uris.py	2011-02-15 14:03:00 +0000
@@ -28,12 +28,20 @@
     ]
 
 from urlparse import urlparse
+<<<<<<< TREE
 import warnings
 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/'
+=======
+>>>>>>> MERGE-SOURCE
 STAGING_SERVICE_ROOT = 'https://api.staging.launchpad.net/'
+QASTAGING_SERVICE_ROOT = 'https://api.qastaging.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/'
@@ -64,8 +72,13 @@
 
 web_roots = dict(
     production=LPNET_WEB_ROOT,
+<<<<<<< TREE
     edge = LPNET_WEB_ROOT,
     qastaging=QASTAGING_WEB_ROOT,
+=======
+    edge=LPNET_WEB_ROOT,
+    qastaging=QASTAGING_WEB_ROOT,
+>>>>>>> MERGE-SOURCE
     staging=STAGING_WEB_ROOT,
     dogfood=DOGFOOD_WEB_ROOT,
     dev=DEV_WEB_ROOT,
@@ -75,9 +88,16 @@
 
 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)
+<<<<<<< TREE
+    if root == 'edge':
+        warnings.warn(("Launchpad edge server no longer exists. "
+                       "Using 'production' instead."), DeprecationWarning)
+=======
+    if root == 'edge':
+        warnings.warn(("Launchpad edge server no longer exists. "
+                       "Using 'production' instead."), DeprecationWarning)
+
+>>>>>>> MERGE-SOURCE
     if root in aliases:
         return aliases[root]
 
@@ -98,9 +118,15 @@
     appropriate URI. A URI gets returned as is. Any other string raises a
     ValueError.
     """
+<<<<<<< TREE
     if service_root == EDGE_SERVICE_ROOT:
         # This will trigger a deprecation warning and use production instead.
         service_root = 'edge'
+=======
+    if service_root == EDGE_SERVICE_ROOT:
+        # This will trigger a deprecation warning.
+        service_root = 'edge'
+>>>>>>> MERGE-SOURCE
     return _dereference_alias(service_root, service_roots)
 
 
@@ -111,9 +137,15 @@
     appropriate URI. A URI gets returned as is. Any other string raises a
     ValueError.
     """
+<<<<<<< TREE
     if web_root == EDGE_WEB_ROOT:
         # This will trigger a deprecation warning and use production instead.
         web_root = 'edge'
+=======
+    if web_root == EDGE_WEB_ROOT:
+        # This will trigger a deprecation warning.
+        web_root = 'edge'
+>>>>>>> MERGE-SOURCE
     return _dereference_alias(web_root, web_roots)