Merge lp:~brian.curtin/ubuntu-sso-client/drop-lazr-lint-fixes into lp:ubuntu-sso-client

[Brian Curtin]

Removed the lazr.restfulclient dependency by removing TimestampedAuthorizer class. Contributed by György Balló.

From György Balló's lp:~ballogy/ubuntu-sso-client/drop-lazr branch:

This change removes lazr.restfulclient dependency by removing TimestampedAuthorizer class. It seems that TimestampedAuthorizer is not used by ubuntu-sso-client or ubuntuone-client, so I request to remove it.

I'm packaging Ubuntu One client for Arch Linux and this change makes it much easier, because I don't need to package lazr.restfulclient, lazr.uri and python-wadllib.

[This proposal includes György's changes and two additional lint fixes to ensure the branch can land.]

[Manuel de la Peña (mandel)]

hurray we have no lint issues!

review: Approve

=== modified file 'ubuntu_sso/account.py'
--- ubuntu_sso/account.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/account.py	2012-05-29 17:03:23 +0000
@@ -38,8 +38,6 @@
 import os
 import re
 
-from lazr.restfulclient.authorize.oauth import OAuthAuthorizer
-from oauth import oauth
 from twisted.internet import defer
 
 from ubuntu_sso.logger import setup_logging
@@ -54,27 +52,6 @@
 SSO_STATUS_ERROR = 'error'
 
 
-class TimestampedAuthorizer(OAuthAuthorizer):
-    """Includes a custom timestamp on OAuth signatures."""
-
-    def __init__(self, get_timestamp, *args, **kwargs):
-        """Store the get_timestamp method, and move on."""
-        super(TimestampedAuthorizer, self).__init__(*args, **kwargs)
-        self.get_timestamp = get_timestamp
-
-    # pylint: disable=C0103
-    def authorizeRequest(self, absolute_uri, method, body, headers):
-        """Override authorizeRequest including the timestamp."""
-        parameters = {"oauth_timestamp": self.get_timestamp()}
-        oauth_request = oauth.OAuthRequest.from_consumer_and_token(
-            self.consumer, self.access_token, http_url=absolute_uri,
-            parameters=parameters)
-        oauth_request.sign_request(
-            oauth.OAuthSignatureMethod_PLAINTEXT(),
-            self.consumer, self.access_token)
-        headers.update(oauth_request.to_header(self.oauth_realm))
-
-
 class InvalidEmailError(Exception):
     """The email is not valid."""
 

=== modified file 'ubuntu_sso/tests/test_account.py'
--- ubuntu_sso/tests/test_account.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/tests/test_account.py	2012-05-29 17:03:23 +0000
@@ -34,7 +34,6 @@
 import os
 import urllib2
 
-from oauth import oauth
 from twisted.trial.unittest import TestCase
 from twisted.internet import defer
 
@@ -51,7 +50,6 @@
     ResetPasswordTokenError,
     SSO_STATUS_OK,
     SSO_STATUS_ERROR,
-    TimestampedAuthorizer,
 )
 from ubuntu_sso.tests import (
     APP_NAME,
@@ -203,36 +201,6 @@
             return defer.fail(e)
 
 
-class TimestampedAuthorizerTestCase(TestCase):
-    """Test suite for the TimestampedAuthorizer."""
-
-    def test_authorize_request_includes_timestamp(self):
-        """The authorizeRequest method includes the timestamp."""
-        fromcandt_call = []
-        fake_uri = "http://protocultura.net"
-        fake_timestamp = 1234
-        get_fake_timestamp = lambda: fake_timestamp
-        original_oauthrequest = oauth.OAuthRequest
-
-        class FakeOAuthRequest(oauth.OAuthRequest):
-            """A Fake OAuthRequest class."""
-
-            @staticmethod
-            def from_consumer_and_token(*args, **kwargs):
-                """A fake from_consumer_and_token."""
-                fromcandt_call.append((args, kwargs))
-                builder = original_oauthrequest.from_consumer_and_token
-                return builder(*args, **kwargs)
-
-        self.patch(oauth, "OAuthRequest", FakeOAuthRequest)
-
-        authorizer = TimestampedAuthorizer(get_fake_timestamp, "ubuntuone")
-        authorizer.authorizeRequest(fake_uri, "POST", None, {})
-        call_kwargs = fromcandt_call[0][1]
-        parameters = call_kwargs["parameters"]
-        self.assertEqual(parameters["oauth_timestamp"], fake_timestamp)
-
-
 class AccountTestCase(TestCase):
     """Test suite for the SSO login processor."""