Merge "Remove unnecessary __init__"
This commit is contained in:
@@ -360,9 +360,6 @@ class Ec2ControllerV3(Ec2ControllerCommon, controller.V3Controller):
|
|||||||
collection_name = 'credentials'
|
collection_name = 'credentials'
|
||||||
member_name = 'credential'
|
member_name = 'credential'
|
||||||
|
|
||||||
def __init__(self):
|
|
||||||
super(Ec2ControllerV3, self).__init__()
|
|
||||||
|
|
||||||
def _check_credential_owner_and_user_id_match(self, request, prep_info,
|
def _check_credential_owner_and_user_id_match(self, request, prep_info,
|
||||||
user_id, credential_id):
|
user_id, credential_id):
|
||||||
# NOTE(morganfainberg): this method needs to capture the arguments of
|
# NOTE(morganfainberg): this method needs to capture the arguments of
|
||||||
|
@@ -422,7 +422,6 @@ class LDAPHandler(object):
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@abc.abstractmethod
|
|
||||||
def __init__(self, conn=None):
|
def __init__(self, conn=None):
|
||||||
self.conn = conn
|
self.conn = conn
|
||||||
|
|
||||||
@@ -495,9 +494,6 @@ class PythonLDAPHandler(LDAPHandler):
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, conn=None):
|
|
||||||
super(PythonLDAPHandler, self).__init__(conn=conn)
|
|
||||||
|
|
||||||
def connect(self, url, page_size=0, alias_dereferencing=None,
|
def connect(self, url, page_size=0, alias_dereferencing=None,
|
||||||
use_tls=False, tls_cacertfile=None, tls_cacertdir=None,
|
use_tls=False, tls_cacertfile=None, tls_cacertdir=None,
|
||||||
tls_req_cert=ldap.OPT_X_TLS_DEMAND, chase_referrals=None,
|
tls_req_cert=ldap.OPT_X_TLS_DEMAND, chase_referrals=None,
|
||||||
|
@@ -22,8 +22,6 @@ from keystone.token.providers import common
|
|||||||
|
|
||||||
|
|
||||||
class Provider(common.BaseProvider):
|
class Provider(common.BaseProvider):
|
||||||
def __init__(self, *args, **kwargs):
|
|
||||||
super(Provider, self).__init__(*args, **kwargs)
|
|
||||||
|
|
||||||
def _get_token_id(self, token_data):
|
def _get_token_id(self, token_data):
|
||||||
return uuid.uuid4().hex
|
return uuid.uuid4().hex
|
||||||
|
Reference in New Issue
Block a user