Merge lp:~leonardr/launchpadlib/multiversion-fix into lp:launchpadlib

[Leonard Richardson]

[Leonard Richardson (leonardr)]

This branch fixes a very small bug in launchpadlib. There are two code paths in login_with() depending on whether the credentials were loaded from a file. The 'version' argument to login_with() was only being propagated in one of those code paths. So if your credentials were loaded from a file, you would always access the 'beta' version of the Launchpad web service, no matter what you'd requested.

[Muharem Hrnjadovic (al-maisan)]

Looks good!

review: Approve

=== modified file 'src/launchpadlib/NEWS.txt'
--- src/launchpadlib/NEWS.txt	2009-12-17 17:32:12 +0000
+++ src/launchpadlib/NEWS.txt	2010-03-03 18:45:23 +0000
@@ -2,6 +2,18 @@
 NEWS for launchpadlib
 =====================
 
+1.5.6 (2010-03-03)
+==================
+
+- Fixed a minor bug when using login_with() to access a version of the
+  Launchpad web service other than the default.
+
+1.5.5
+=====
+
+- Added the ability to access different versions of the Launchpad web
+  service.
+
 1.5.4 (2009-12-17)
 ==================
 

=== modified file 'src/launchpadlib/__init__.py'
--- src/launchpadlib/__init__.py	2010-02-15 16:34:26 +0000
+++ src/launchpadlib/__init__.py	2010-03-03 18:45:23 +0000
@@ -14,4 +14,4 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = '1.5.5'
+__version__ = '1.5.6'

=== modified file 'src/launchpadlib/launchpad.py'
--- src/launchpadlib/launchpad.py	2010-02-16 23:46:00 +0000
+++ src/launchpadlib/launchpad.py	2010-03-03 18:45:23 +0000
@@ -248,7 +248,7 @@
                 consumer_credentials_path)
             launchpad = cls(
                 credentials, service_root=service_root, cache=cache_path,
-                timeout=timeout, proxy_info=proxy_info)
+                timeout=timeout, proxy_info=proxy_info, version=version)
         else:
             launchpad = cls.get_token_and_login(
                 consumer_name, service_root=service_root, cache=cache_path,

=== modified file 'src/launchpadlib/tests/test_launchpad.py'
--- src/launchpadlib/tests/test_launchpad.py	2010-02-17 00:15:40 +0000
+++ src/launchpadlib/tests/test_launchpad.py	2010-03-03 18:45:23 +0000
@@ -148,6 +148,23 @@
         mode = stat.S_IMODE(statinfo.st_mode)
         self.assertEqual(mode, stat.S_IWRITE | stat.S_IREAD | stat.S_IEXEC)
 
+    def test_version_is_propagated(self):
+        # Make sure the login_with() method conveys the 'version' argument
+        # all the way to the Launchpad object.
+        launchpadlib_dir = os.path.join(self.temp_dir, 'launchpadlib')
+        launchpad = NoNetworkLaunchpad.login_with(
+            'not important', service_root='http://api.example.com/',
+            launchpadlib_dir=launchpadlib_dir, version="foo")
+        self.assertEquals(launchpad.passed_in_kwargs['version'], 'foo')
+
+        # The second time we call login_with(), a different code path
+        # is executed as the credentials are loaded from disk. Make
+        # sure this code path propagates the 'version' argument as well.
+        launchpad = NoNetworkLaunchpad.login_with(
+            'not important', service_root='http://api.example.com/',
+            launchpadlib_dir=launchpadlib_dir, version="bar")
+        self.assertEquals(launchpad.passed_in_kwargs['version'], 'bar')
+
     def test_no_credentials_calls_get_token_and_login(self):
         # If no credentials are found, get_token_and_login() is called.
         service_root = 'http://api.example.com/beta'
@@ -250,16 +267,19 @@
             access_token=AccessToken('access_key:84', 'access_secret:168'))
         credentials.save_to_path(credentials_file_path)
 
-        service_root = 'http://api.example.com/beta'
+        service_root = 'http://api.example.com/'
         timeout = object()
         proxy_info = object()
+        version = "foo"
         launchpad = NoNetworkLaunchpad.login_with(
             'app name', launchpadlib_dir=self.temp_dir,
-            service_root=service_root, timeout=timeout, proxy_info=proxy_info)
+            service_root=service_root, timeout=timeout, proxy_info=proxy_info,
+            version=version)
         expected_arguments = dict(
             service_root=service_root,
             timeout=timeout,
             proxy_info=proxy_info,
+            version=version,
             cache=os.path.join(self.temp_dir, 'api.example.com', 'cache'))
         self.assertEqual(launchpad.passed_in_kwargs, expected_arguments)