From e2f6561097bc98667fe394f33841916a208cda3b Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Tue, 21 Sep 2021 15:42:28 +0200 Subject: [PATCH 59/59] misc: fix deprecated-method pylint error (#56982) --- src/authentic2/compat/misc.py | 28 ------------------- .../disco_service/disco_responder.py | 10 +++---- src/authentic2/utils/misc.py | 5 ++-- 3 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 src/authentic2/compat/misc.py diff --git a/src/authentic2/compat/misc.py b/src/authentic2/compat/misc.py deleted file mode 100644 index 20a68026..00000000 --- a/src/authentic2/compat/misc.py +++ /dev/null @@ -1,28 +0,0 @@ -# authentic2 - versatile identity manager -# Copyright (C) 2010-2019 Entr'ouvert -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU Affero General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -import inspect - -if hasattr(inspect, 'signature'): - - def signature_parameters(func): - return inspect.signature(func).parameters.keys() - - -else: - - def signature_parameters(func): - return inspect.getargspec(func)[0] diff --git a/src/authentic2/disco_service/disco_responder.py b/src/authentic2/disco_service/disco_responder.py index bb7f48c1..20fdb28b 100644 --- a/src/authentic2/disco_service/disco_responder.py +++ b/src/authentic2/disco_service/disco_responder.py @@ -76,14 +76,14 @@ def get_disco_return_url_from_metadata(entity_id): try: liberty_provider = LibertyProvider.objects.get(entity_id=entity_id) except Exception: - logger.warn('get_disco_return_url_from_metadata: unknown service provider %s', entity_id) + logger.warning('get_disco_return_url_from_metadata: unknown service provider %s', entity_id) return None dom = parseString(liberty_provider.metadata.encode('utf8')) endpoints = dom.getElementsByTagNameNS( 'urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol', 'DiscoveryResponse' ) if not endpoints: - logger.warn('get_disco_return_url_from_metadata: no discovery service endpoint for %s', entity_id) + logger.warning('get_disco_return_url_from_metadata: no discovery service endpoint for %s', entity_id) return None ep = None value = 0 @@ -100,7 +100,7 @@ def get_disco_return_url_from_metadata(entity_id): value = int(endpoint.attributes['index'].value) ep = endpoint if not ep: - logger.warn("get_disco_return_url_from_metadata: no valid endpoint for %s", entity_id) + logger.warning("get_disco_return_url_from_metadata: no valid endpoint for %s", entity_id) return None logger.debug('get_disco_return_url_from_metadata: found endpoint with index %s', value) @@ -110,7 +110,7 @@ def get_disco_return_url_from_metadata(entity_id): logger.debug('get_disco_return_url_from_metadata: location is %s', location) return location - logger.warn('get_disco_return_url_from_metadata: no location found for endpoint with index %s', value) + logger.warning('get_disco_return_url_from_metadata: no location found for endpoint with index %s', value) return None @@ -152,7 +152,7 @@ def disco(request): if not is_known_idp(idp_selected): message = 'The idp is unknown.' - logger.warn("disco: Unknown selected idp %s", idp_selected) + logger.warning("disco: Unknown selected idp %s", idp_selected) save_key_values(request, entityID, _return, policy, returnIDParam, isPassive) return HttpResponseRedirect(reverse(idp_selection)) diff --git a/src/authentic2/utils/misc.py b/src/authentic2/utils/misc.py index 2d791fb9..f716d939 100644 --- a/src/authentic2/utils/misc.py +++ b/src/authentic2/utils/misc.py @@ -16,6 +16,7 @@ import copy import ctypes +import inspect import logging import random import time @@ -578,8 +579,6 @@ def get_user_from_session_key(session_key): from django.contrib.auth import BACKEND_SESSION_KEY, SESSION_KEY, load_backend from django.contrib.auth.models import AnonymousUser - from authentic2.compat.misc import signature_parameters - SessionStore = import_module(settings.SESSION_ENGINE).SessionStore session = SessionStore(session_key=session_key) try: @@ -587,7 +586,7 @@ def get_user_from_session_key(session_key): backend_path = session[BACKEND_SESSION_KEY] assert backend_path in settings.AUTHENTICATION_BACKENDS backend = load_backend(backend_path) - if 'session' in signature_parameters(backend.get_user): + if 'session' in inspect.signature(backend.get_user).parameters: user = backend.get_user(user_id, session) or AnonymousUser() else: user = backend.get_user(user_id) or AnonymousUser() -- 2.30.2