Merge "Clean up oauth auth plugin code"

keystoneclient/tests/v3/test_oauth1.py

@@ -260,7 +260,7 @@ class AuthenticateWithOAuthTests(TokenTests):
                        access_secret=access_secret)
         s = session.Session(auth=a)
         t = s.get_token()
-        self.assertEqual(t, self.TEST_TOKEN)
+        self.assertEqual(self.TEST_TOKEN, t)
 
         OAUTH_REQUEST_BODY = {
             "auth": {
@@ -286,9 +286,6 @@ class AuthenticateWithOAuthTests(TokenTests):
 
 class TestOAuthLibModule(utils.TestCase):
 
-    def setUp(self):
-        super(TestOAuthLibModule, self).setUp()
-
     def test_no_oauthlib_installed(self):
         with mock.patch.object(auth, 'oauth1', None):
             self.assertRaises(NotImplementedError,

keystoneclient/v3/contrib/oauth1/auth.py

@@ -53,6 +53,3 @@ class OAuthMethod(v3.AuthMethod):
 
 class OAuth(v3._AuthConstructor):
     _auth_method_class = OAuthMethod
-
-    def __init__(self, auth_url, **kwargs):
-        super(OAuth, self).__init__(auth_url, **kwargs)