Merge lp:~leonardr/launchpad/launchpadlib-integration into lp:launchpad

[Leonard Richardson]

This branch makes some minor changes to launchpadlib that I made while integrating my branch https://code.launchpad.net/~leonardr/launchpadlib/separate-login-for-cronjob into Launchpad.

* Bumped the version number.
* Removed a doctest of login(), since the method is deprecated (and it now has a unit test).
* Made the TestableLaunchpad class provide default values for credential_store and authorization_engine.
* Changed the KnownTokens convenience class to pass in a Credentials object into the TestableLaunchpad constructor, rather than using the now-deprecated login() method.

[Leonard Richardson (leonardr)]

Sorry, this is the wrong branch for that MP. Here's the real MP.

This branch makes some minor changes to launchpadlib that I made while integrating my branch https://code.launchpad.net/~leonardr/launchpadlib/launchpad-integration into Launchpad.

* Require new versions of launchpadlib and lazr.restfulclient
* Require the 'keyring' module, a new dependency of launchpadlib
* Many tests invoke the Launchpad constructor, which now takes two new arguments (a token authorization engine and a credential store). These tests don't need either, which is why they're invoking the constructor instead of using login_with(). I changed the tests to pass in None for those two arguments.

[Māris Fogels (mars)]

Hi Leonard,

This change looks good to me. +1, r=mars

Maris

review: Approve

=== modified file 'lib/canonical/launchpad/pagetests/webservice/launchpadlib.txt'
--- lib/canonical/launchpad/pagetests/webservice/launchpadlib.txt	2010-08-12 16:40:04 +0000
+++ lib/canonical/launchpad/pagetests/webservice/launchpadlib.txt	2011-01-05 19:12:20 +0000
@@ -48,7 +48,8 @@
 scheme which does not work in the test environment.
 
     >>> from launchpadlib.launchpad import Launchpad
-    >>> launchpad = Launchpad(credentials, 'http://api.launchpad.dev/')
+    >>> launchpad = Launchpad(
+    ...     credentials, None, None, 'http://api.launchpad.dev/')
     >>> print launchpad.me.name
     no-priv
 
@@ -94,7 +95,8 @@
 Now create a Launchpad object and observe how it populates the cache.
 
     >>> launchpad = Launchpad(
-    ...     credentials, 'http://api.launchpad.dev/', cache=cache)
+    ...     credentials, None, None, 'http://api.launchpad.dev/',
+    ...     cache=cache)
     send: 'GET /1.0/ ...accept: application/vnd.sun.wadl+xml...'
     reply: 'HTTP/1.0 200 Ok\n'
     ...
@@ -106,7 +108,8 @@
 used instead of new HTTP requests being used.
 
     >>> launchpad = Launchpad(
-    ...     credentials, 'http://api.launchpad.dev/', cache=cache)
+    ...     credentials, None, None, 'http://api.launchpad.dev/',
+    ...     cache=cache)
 
 Cleanup.
 
 
=== modified file 'lib/lp/testing/_webservice.py'
--- lib/lp/testing/_webservice.py	2011-01-04 13:34:53 +0000
+++ lib/lp/testing/_webservice.py	2011-01-05 19:12:20 +0000
@@ -145,8 +145,8 @@
     version = version or Launchpad.DEFAULT_VERSION
     cache = tempfile.mkdtemp(prefix='launchpadlib-cache-')
     zope.testing.cleanup.addCleanUp(_clean_up_cache, (cache,))
-    return TestLaunchpad(
-        credentials, service_root, version=version, cache=cache)
+    return TestLaunchpad(credentials, None, None, service_root=service_root,
+                         version=version, cache=cache)
 
 
 class TestLaunchpad(Launchpad):
 
=== modified file 'setup.py'
--- setup.py	2010-12-01 11:26:57 +0000
+++ setup.py	2011-01-05 19:12:20 +0000
@@ -47,6 +47,8 @@
         'lazr.testing',
         'lazr.uri',
         'lazr-js',
+        # Required for launchpadlib
+        'keyring',
         'manuel',
         'mechanize',
         'meliae',
 
=== modified file 'versions.cfg'
--- versions.cfg	2010-12-10 20:22:14 +0000
+++ versions.cfg	2011-01-05 19:12:20 +0000
@@ -24,7 +24,8 @@
 grokcore.component = 1.6
 httplib2 = 0.6.0
 ipython = 0.9.1
-launchpadlib = 1.6.5
+keyring = 0.5
+launchpadlib = 1.9.0
 lazr.authentication = 0.1.1
 lazr.batchnavigator = 1.2.2
 lazr.config = 1.1.3
@@ -32,7 +33,7 @@
 lazr.enum = 1.1.2
 lazr.lifecycle = 1.1
 lazr.restful = 0.15.0
-lazr.restfulclient = 0.10.0
+lazr.restfulclient = 0.11.1
 lazr.smtptest = 1.1
 lazr.testing = 0.1.1
 lazr.uri = 1.0.2