From 3c112f5c20cdec55c062f0b06751650132af8637 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Tue, 21 Sep 2021 11:31:27 +0200 Subject: [PATCH 46/59] misc: fix reimported pylint error (#56982) --- src/authentic2/backends/models_backend.py | 4 ++-- src/authentic2/forms/profile.py | 2 -- src/authentic2/manager/role_views.py | 3 +-- src/authentic2/utils/misc.py | 7 ------- tests/test_all.py | 11 ----------- tests/test_api.py | 18 ------------------ tests/test_ldap.py | 8 -------- tests/test_user_manager.py | 2 -- 8 files changed, 3 insertions(+), 52 deletions(-) diff --git a/src/authentic2/backends/models_backend.py b/src/authentic2/backends/models_backend.py index dfa06866..f545d096 100644 --- a/src/authentic2/backends/models_backend.py +++ b/src/authentic2/backends/models_backend.py @@ -64,9 +64,9 @@ class ModelBackend(BaseModelBackend): return queries def must_reset_password(self, user): - from .. import models + from authentic2 import models as a2_models - return bool(models.PasswordReset.filter(user=user).count()) + return bool(a2_models.PasswordReset.filter(user=user).count()) def authenticate(self, request, username=None, password=None, realm=None, ou=None): UserModel = get_user_model() diff --git a/src/authentic2/forms/profile.py b/src/authentic2/forms/profile.py index a86892ff..ea389ffc 100644 --- a/src/authentic2/forms/profile.py +++ b/src/authentic2/forms/profile.py @@ -75,8 +75,6 @@ class BaseUserForm(LockedFieldFormMixin, forms.ModelForm): } def __init__(self, *args, **kwargs): - from authentic2 import models - self.attributes = models.Attribute.objects.all() initial = kwargs.setdefault('initial', {}) instance = kwargs.get('instance') diff --git a/src/authentic2/manager/role_views.py b/src/authentic2/manager/role_views.py index d5b7234b..bb30f44b 100644 --- a/src/authentic2/manager/role_views.py +++ b/src/authentic2/manager/role_views.py @@ -21,9 +21,8 @@ from django.contrib.auth import get_user_model from django.contrib.contenttypes.models import ContentType from django.core.exceptions import PermissionDenied, ValidationError from django.db import transaction -from django.db.models import BooleanField, Count, ExpressionWrapper, F, Prefetch +from django.db.models import BooleanField, Count, ExpressionWrapper, F, Prefetch, Q from django.db.models.functions import Cast -from django.db.models.query import Prefetch, Q from django.shortcuts import get_object_or_404 from django.urls import reverse from django.utils.functional import cached_property diff --git a/src/authentic2/utils/misc.py b/src/authentic2/utils/misc.py index e2901fcb..52d34625 100644 --- a/src/authentic2/utils/misc.py +++ b/src/authentic2/utils/misc.py @@ -567,10 +567,6 @@ def check_referer(request, skip_post=True): def check_session_key(session_key): '''Check that a session exists for a given session_key.''' - from importlib import import_module - - from django.conf import settings - SessionStore = import_module(settings.SESSION_ENGINE).SessionStore s = SessionStore(session_key=session_key) # If session is empty, it's new @@ -579,9 +575,6 @@ def check_session_key(session_key): def get_user_from_session_key(session_key): '''Get the user logged in an active session''' - from importlib import import_module - - from django.conf import settings from django.contrib.auth import BACKEND_SESSION_KEY, SESSION_KEY, load_backend from django.contrib.auth.models import AnonymousUser diff --git a/tests/test_all.py b/tests/test_all.py index f71b8900..c7451cb5 100644 --- a/tests/test_all.py +++ b/tests/test_all.py @@ -42,8 +42,6 @@ from .utils import Authentic2TestCase, assert_event, get_link_from_mail, get_res class SerializerTests(TestCase): def test_generic_foreign_key_natural_key(self): - import json - from django.core import serializers from authentic2.models import Attribute, AttributeValue @@ -430,9 +428,6 @@ class APITest(TestCase): @override_settings(A2_REQUIRED_FIELDS=['username']) def register_with_user(self, user, cred): - from django.contrib.auth import get_user_model - from rest_framework import status, test - # disable existing attributes models.Attribute.objects.update(disabled=True) @@ -537,9 +532,6 @@ class APITest(TestCase): @override_settings(A2_REQUIRED_FIELDS=['username']) def test_email_is_unique_double_registration(self): - from django.contrib.auth import get_user_model - from rest_framework import status, test - # disable existing attributes models.Attribute.objects.update(disabled=True) @@ -626,9 +618,6 @@ class APITest(TestCase): @override_settings(A2_REQUIRED_FIELDS=['username']) def test_email_username_is_unique_double_registration(self): - from django.contrib.auth import get_user_model - from rest_framework import status, test - # disable existing attributes models.Attribute.objects.update(disabled=True) diff --git a/tests/test_api.py b/tests/test_api.py index 75d205d4..9b67cbd3 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -232,8 +232,6 @@ def test_api_member_users_list(app, user, simple_role): def test_api_users_update_with_email_verified(settings, app, admin, simple_user): - from django.contrib.auth import get_user_model - simple_user.email_verified = True simple_user.save() @@ -263,8 +261,6 @@ def test_api_users_update_with_email_verified(settings, app, admin, simple_user) def test_api_users_update_without_email_verified(settings, app, admin, simple_user): - from django.contrib.auth import get_user_model - simple_user.email_verified = True simple_user.save() @@ -292,8 +288,6 @@ def test_api_users_update_without_email_verified(settings, app, admin, simple_us def test_api_users_update_with_same_unique_email(settings, app, admin, simple_user): - from django.contrib.auth import get_user_model - ou = get_default_ou() ou.email_is_unique = True ou.save() @@ -313,8 +307,6 @@ def test_api_users_update_with_same_unique_email(settings, app, admin, simple_us def test_api_users_create_with_email_verified(settings, app, admin): - from django.contrib.auth import get_user_model - payload = { 'username': 'janedoe', 'email': 'jane.doe@nowhere.null', @@ -331,8 +323,6 @@ def test_api_users_create_with_email_verified(settings, app, admin): def test_api_users_create_without_email_verified(settings, app, admin): - from django.contrib.auth import get_user_model - payload = { 'username': 'janedoe', 'email': 'jane.doe@nowhere.null', @@ -347,8 +337,6 @@ def test_api_users_create_without_email_verified(settings, app, admin): def test_api_email_unset_verification(settings, app, admin, simple_user): - from django.contrib.auth import get_user_model - simple_user.email_verified = True simple_user.save() @@ -378,8 +366,6 @@ def test_api_users_boolean_attribute_optional(app, superuser): def test_api_users_list_by_authorized_service(app, superuser): - from authentic2.models import Service - app.authorization = ('Basic', (superuser.username, superuser.username)) user1 = User.objects.create(username='user1') @@ -409,8 +395,6 @@ def test_api_users_list_by_authorized_service(app, superuser): def test_api_member_users_list_by_authorized_service(app, superuser, simple_role): - from authentic2.models import Service - app.authorization = ('Basic', (superuser.username, superuser.username)) url = reverse('a2-api-role-members-list', kwargs={'role_uuid': simple_role.uuid}) @@ -476,8 +460,6 @@ def test_api_member_users_list_search_text(app, superuser, simple_role): def test_api_users_create(settings, app, api_user): - from django.contrib.auth import get_user_model - at = Attribute.objects.create(kind='title', name='title', label='title') app.authorization = ('Basic', (api_user.username, api_user.username)) # test missing first_name diff --git a/tests/test_ldap.py b/tests/test_ldap.py index 69f226be..e2f82055 100644 --- a/tests/test_ldap.py +++ b/tests/test_ldap.py @@ -821,8 +821,6 @@ def test_get_users(slapd, settings, db, monkeypatch, caplog): def test_set_mandatory_roles(slapd, settings, db): - from authentic2.a2_rbac.models import Role - Role.objects.get_or_create(name='tech') Role.objects.get_or_create(name='admin') settings.LDAP_AUTH_SETTINGS = [ @@ -863,8 +861,6 @@ def test_nocreate_mandatory_roles(slapd, settings, db): def test_from_slug_set_mandatory_roles(slapd, settings, db): - from authentic2.a2_rbac.models import Role - Role.objects.get_or_create(name='Tech', slug='tech') Role.objects.get_or_create(name='Admin', slug='admin') settings.LDAP_AUTH_SETTINGS = [ @@ -886,8 +882,6 @@ def test_from_slug_set_mandatory_roles(slapd, settings, db): def test_multiple_slug_set_mandatory_roles(slapd, settings, db): - from authentic2.a2_rbac.models import Role - service1 = Service.objects.create(name='s1', slug='s1') service2 = Service.objects.create(name='s2', slug='s2') Role.objects.create(name='foo', slug='tech', service=service1) @@ -911,8 +905,6 @@ def test_multiple_slug_set_mandatory_roles(slapd, settings, db): def test_multiple_name_set_mandatory_roles(slapd, settings, db): - from authentic2.a2_rbac.models import Role - OU = get_ou_model() ou1 = OU.objects.create(name='test1', slug='test1') ou2 = OU.objects.create(name='test2', slug='test2') diff --git a/tests/test_user_manager.py b/tests/test_user_manager.py index 368f8260..68063ed7 100644 --- a/tests/test_user_manager.py +++ b/tests/test_user_manager.py @@ -1076,8 +1076,6 @@ def test_manager_user_authorizations(app, superuser, simple_user): * try to remove a service consent """ from authentic2.a2_rbac.models import MANAGE_AUTHORIZATIONS_OP - from django_rbac.models import VIEW_OP - from django_rbac.utils import get_operation, get_permission_model, get_role_model from tests.conftest import create_user Role = get_role_model() -- 2.30.2