From f08a3ab989b5e09f1e48866683ce7085495d0386 Mon Sep 17 00:00:00 2001 From: Marek Denis Date: Thu, 19 Jun 2014 09:39:19 +0200 Subject: [PATCH] Rename v3._AuthConstructor to v3.AuthConstructor Since more auth plugins depending on v3._AuthConstructor are created in separated modules, this class should no longer be named as it was private. Auth plugins using v3._AuthConstructor currently are: - SAML2 auth plugin (under review) - oAuth auth plugin (merged with basecode) Change-Id: Ia097941a465a972dc7ca177a74c8fb8d21d219e6 --- keystoneclient/auth/identity/v3.py | 8 ++++---- keystoneclient/v3/contrib/oauth1/auth.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/keystoneclient/auth/identity/v3.py b/keystoneclient/auth/identity/v3.py index 50288a3ab..a169a1799 100644 --- a/keystoneclient/auth/identity/v3.py +++ b/keystoneclient/auth/identity/v3.py @@ -159,7 +159,7 @@ class AuthMethod(object): @six.add_metaclass(abc.ABCMeta) -class _AuthConstructor(Auth): +class AuthConstructor(Auth): """AuthConstructor is a means of creating an Auth Plugin that contains only one authentication method. This is generally the required usage. @@ -173,7 +173,7 @@ class _AuthConstructor(Auth): def __init__(self, auth_url, *args, **kwargs): method_kwargs = self._auth_method_class._extract_kwargs(kwargs) method = self._auth_method_class(*args, **method_kwargs) - super(_AuthConstructor, self).__init__(auth_url, [method], **kwargs) + super(AuthConstructor, self).__init__(auth_url, [method], **kwargs) class PasswordMethod(AuthMethod): @@ -211,7 +211,7 @@ class PasswordMethod(AuthMethod): return 'password', {'user': user} -class Password(_AuthConstructor): +class Password(AuthConstructor): _auth_method_class = PasswordMethod @@ -231,7 +231,7 @@ class TokenMethod(AuthMethod): return 'token', {'id': self.token} -class Token(_AuthConstructor): +class Token(AuthConstructor): _auth_method_class = TokenMethod def __init__(self, auth_url, token, **kwargs): diff --git a/keystoneclient/v3/contrib/oauth1/auth.py b/keystoneclient/v3/contrib/oauth1/auth.py index 19446f070..028203e0d 100644 --- a/keystoneclient/v3/contrib/oauth1/auth.py +++ b/keystoneclient/v3/contrib/oauth1/auth.py @@ -51,5 +51,5 @@ class OAuthMethod(v3.AuthMethod): return 'oauth1', {} -class OAuth(v3._AuthConstructor): +class OAuth(v3.AuthConstructor): _auth_method_class = OAuthMethod