From 94e53d86c9376236a2acd7df1c95553f1f385791 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Tue, 21 Sep 2021 10:54:41 +0200 Subject: [PATCH 37/59] misc: fix pointless-statement pylint error (#56982) --- src/authentic2/disco_service/disco_responder.py | 3 +-- src/authentic2/management/commands/slapd-shell.py | 1 - src/authentic2/utils/misc.py | 2 +- src/authentic2_auth_oidc/backends.py | 2 +- .../management/commands/oidc-register-issuer.py | 1 - tests/test_all.py | 1 - tests/test_api.py | 1 - tests/test_commands.py | 1 - tests/test_journal.py | 8 ++++---- 9 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/authentic2/disco_service/disco_responder.py b/src/authentic2/disco_service/disco_responder.py index b96d314b..2661e5d9 100644 --- a/src/authentic2/disco_service/disco_responder.py +++ b/src/authentic2/disco_service/disco_responder.py @@ -63,7 +63,7 @@ def set_or_refresh_prefered_idp(request, prefered_idp): def get_prefered_idp(request): # XXX: Read cookie if any if 'prefered_idp' in request.session: - request.session['prefered_idp'] + return request.session['prefered_idp'] def is_known_idp(idp): @@ -75,7 +75,6 @@ def get_disco_return_url_from_metadata(entity_id): liberty_provider = None try: liberty_provider = LibertyProvider.objects.get(entity_id=entity_id) - liberty_provider.service_provider except Exception: logger.warn('get_disco_return_url_from_metadata: unknown service provider %s', entity_id) return None diff --git a/src/authentic2/management/commands/slapd-shell.py b/src/authentic2/management/commands/slapd-shell.py index f505858e..12334ee3 100644 --- a/src/authentic2/management/commands/slapd-shell.py +++ b/src/authentic2/management/commands/slapd-shell.py @@ -110,7 +110,6 @@ class Command(BaseCommand): elif state == ATTR: if line == '\n': self.ldap(command, attrs) - state == COMMAND attrs = {} sys.stdout.flush() sys.exit(0) diff --git a/src/authentic2/utils/misc.py b/src/authentic2/utils/misc.py index 47048ff0..e2901fcb 100644 --- a/src/authentic2/utils/misc.py +++ b/src/authentic2/utils/misc.py @@ -534,7 +534,7 @@ def generate_password(): def form_add_error(form, msg, safe=False): # without this line form._errors is not initialized - form.errors + form.errors # pylint: disable=pointless-statement errors = form._errors.setdefault(forms.forms.NON_FIELD_ERRORS, ErrorList()) if safe: msg = html.mark_safe(msg) diff --git a/src/authentic2_auth_oidc/backends.py b/src/authentic2_auth_oidc/backends.py index f989b7b4..9db3e363 100644 --- a/src/authentic2_auth_oidc/backends.py +++ b/src/authentic2_auth_oidc/backends.py @@ -87,7 +87,7 @@ class OIDCBackend(ModelBackend): if key_or_keyset: jwt = JWT(jwt=original_id_token, key=key_or_keyset, check_claims={}, algs=algs) - jwt.claims + jwt.claims # pylint: disable=pointless-statement if isinstance(id_token.aud, str) and provider.client_id != id_token.aud: logger.warning( diff --git a/src/authentic2_auth_oidc/management/commands/oidc-register-issuer.py b/src/authentic2_auth_oidc/management/commands/oidc-register-issuer.py index 9f69752f..069b0734 100644 --- a/src/authentic2_auth_oidc/management/commands/oidc-register-issuer.py +++ b/src/authentic2_auth_oidc/management/commands/oidc-register-issuer.py @@ -130,7 +130,6 @@ class Command(BaseCommand): print(field.verbose_name, ':') value = getattr(provider, field.name) if isinstance(value, dict): - print pprint.pprint(value) elif hasattr(provider, str('get_' + field.attname + '_display')): print(getattr(provider, 'get_' + field.attname + '_display')(), '(%s)' % value) diff --git a/tests/test_all.py b/tests/test_all.py index 71a49667..f71b8900 100644 --- a/tests/test_all.py +++ b/tests/test_all.py @@ -543,7 +543,6 @@ class APITest(TestCase): # disable existing attributes models.Attribute.objects.update(disabled=True) - user = self.reguser3 cred = self.reguser3_cred User = get_user_model() user_count = User.objects.count() diff --git a/tests/test_api.py b/tests/test_api.py index dde22e2f..75d205d4 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -2435,7 +2435,6 @@ def test_api_statistics(app, admin, freezer, event_type_name, event_name): method2 = {'how': 'fc'} event_type = EventType.objects.get_for_name(event_type_name) - event_type_definition = event_type.definition freezer.move_to('2020-02-03 12:00') event = Event.objects.create(type=event_type, references=[portal], data=method) diff --git a/tests/test_commands.py b/tests/test_commands.py index 92de184d..c33d5f13 100644 --- a/tests/test_commands.py +++ b/tests/test_commands.py @@ -297,7 +297,6 @@ def test_check_and_repair_managers_of_roles(db, capsys): manager_role1 = Role.objects.create(name='Managers of Role 1', slug='_a2-managers-of-role-role1') manager_role1.permissions.add(perm1) manager_role1.save() - manager_role1_id = manager_role1.id call_command('check-and-repair', '--repair', '--noinput') diff --git a/tests/test_journal.py b/tests/test_journal.py index f6fe8602..9ebbdb35 100644 --- a/tests/test_journal.py +++ b/tests/test_journal.py @@ -114,7 +114,7 @@ def test_models(db, django_assert_num_queries): events = list(Event.objects.prefetch_references()) assert len(events) == 12 event = events[0] - event.type.name + assert event.type.name == 'sso' assert event.user == user assert len(event.references) == 1 assert event.references[0] == service @@ -439,19 +439,19 @@ def test_message_in_context_exception_handling(db, some_event_types, caplog): journal.record('user.login', user=user, how='password') event = Event.objects.get() - event.message + assert event.message assert not (caplog.records) caplog.clear() with mock.patch.object(some_event_types['UserLogin'], 'get_message', side_effect=Exception('boum')): - event.message + assert event.message assert len(caplog.records) == 1 assert caplog.records[0].levelname == 'ERROR' assert caplog.records[0].message == 'could not render message of event type "user.login"' caplog.clear() with mock.patch.object(some_event_types['UserLogin'], 'get_message', side_effect=Exception('boum')): - event.message_in_context(None) + assert event.message_in_context(None) assert len(caplog.records) == 1 assert caplog.records[0].levelname == 'ERROR' assert caplog.records[0].message == 'could not render message of event type "user.login"' -- 2.30.2