Merge lp:~dobey/ubuntu-sso-client/oauth-api-break into lp:ubuntu-sso-client

[dobey]

Handle the API changing in 0.3.8 by avoiding passing in params for GET/HEAD.

[Brian Curtin (brian.curtin)]

Tests pass on Windows.

review: Approve

[Mike McCracken (mikemc)]

With oauthlib 0.3.8 on darwin, this branch has the following test failures:

[ERROR]
Traceback (most recent call last):
  File "/Users/mmccrack/Documents/Canonical/Source/test-improve-buildout/scripts/devsetup/parts/ubuntu-sso-client/ubuntu_sso/utils/webclient/tests/test_webclient.py", line 805, in test_build_oauth_request_with_params
    self.test_build_oauth_request(params=self.sample_params)
  File "/Users/mmccrack/Documents/Canonical/Source/test-improve-buildout/scripts/devsetup/parts/ubuntu-sso-client/ubuntu_sso/utils/webclient/tests/test_webclient.py", line 799, in test_build_oauth_request
    self.assertIn(param, body)
exceptions.TypeError: argument of type 'NoneType' is not iterable

ubuntu_sso.utils.webclient.tests.test_webclient.OAuthHmacSha1TestCase.test_build_oauth_request_with_params
ubuntu_sso.utils.webclient.tests.test_webclient.OAuthPlainTextTestCase.test_build_oauth_request_with_params

review: Needs Fixing

[Mike McCracken (mikemc)]

note - those same tests do pass with oauthlib 0.3.7 on darwin

[lp:~dobey/ubuntu-sso-client/oauth-api-break]

1029. By dobey on 2013-04-12

Remove the offending test code, which seems inappropriate now.

[Mike McCracken (mikemc)]

tests pass now

review: Approve

=== modified file 'ubuntu_sso/utils/webclient/common.py'
--- ubuntu_sso/utils/webclient/common.py	2013-02-19 22:12:47 +0000
+++ ubuntu_sso/utils/webclient/common.py	2013-04-12 20:11:22 +0000
@@ -157,9 +157,12 @@
                                               else SIGNATURE_TYPE_AUTH_HEADER),
                               timestamp=str(timestamp))
 
-        url, signed_headers, body = oauth_client.sign(
-            uri, method, parameters if parameters is not None else {},
-            {'Content-Type': 'application/x-www-form-urlencoded'})
+        try:
+            url, signed_headers, body = oauth_client.sign(
+                uri, method, parameters if parameters is not None else {},
+                {'Content-Type': 'application/x-www-form-urlencoded'})
+        except ValueError:
+            url, signed_headers, body = oauth_client.sign(uri, method)
 
         return url, signed_headers, body
 

=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
--- ubuntu_sso/utils/webclient/tests/test_webclient.py	2013-02-19 22:12:47 +0000
+++ ubuntu_sso/utils/webclient/tests/test_webclient.py	2013-04-12 20:11:22 +0000
@@ -794,15 +794,6 @@
 
         self.assert_headers_correct(signed_headers)
         self.assertEqual(url, self.sample_url)
-        if params is not None:
-            for param, value in params.items():
-                self.assertIn(param, body)
-                actual = body[param]
-                self.assertEqual(value, actual)
-
-    def test_build_oauth_request_with_params(self):
-        """Check that the oauth request are properly with params."""
-        self.test_build_oauth_request(params=self.sample_params)
 
     @defer.inlineCallbacks
     def test_build_signed_iri(self, params=None):