Projet

Général

Profil

0046-misc-fix-reimported-pylint-error-56982.patch

Valentin Deniaud, 21 septembre 2021 17:09

Télécharger (10,2 ko)

Voir les différences:

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(-)
src/authentic2/backends/models_backend.py
64 64
        return queries
65 65

  
66 66
    def must_reset_password(self, user):
67
        from .. import models
67
        from authentic2 import models as a2_models
68 68

  
69
        return bool(models.PasswordReset.filter(user=user).count())
69
        return bool(a2_models.PasswordReset.filter(user=user).count())
70 70

  
71 71
    def authenticate(self, request, username=None, password=None, realm=None, ou=None):
72 72
        UserModel = get_user_model()
src/authentic2/forms/profile.py
75 75
    }
76 76

  
77 77
    def __init__(self, *args, **kwargs):
78
        from authentic2 import models
79

  
80 78
        self.attributes = models.Attribute.objects.all()
81 79
        initial = kwargs.setdefault('initial', {})
82 80
        instance = kwargs.get('instance')
src/authentic2/manager/role_views.py
21 21
from django.contrib.contenttypes.models import ContentType
22 22
from django.core.exceptions import PermissionDenied, ValidationError
23 23
from django.db import transaction
24
from django.db.models import BooleanField, Count, ExpressionWrapper, F, Prefetch
24
from django.db.models import BooleanField, Count, ExpressionWrapper, F, Prefetch, Q
25 25
from django.db.models.functions import Cast
26
from django.db.models.query import Prefetch, Q
27 26
from django.shortcuts import get_object_or_404
28 27
from django.urls import reverse
29 28
from django.utils.functional import cached_property
src/authentic2/utils/misc.py
567 567

  
568 568
def check_session_key(session_key):
569 569
    '''Check that a session exists for a given session_key.'''
570
    from importlib import import_module
571

  
572
    from django.conf import settings
573

  
574 570
    SessionStore = import_module(settings.SESSION_ENGINE).SessionStore
575 571
    s = SessionStore(session_key=session_key)
576 572
    # If session is empty, it's new
......
579 575

  
580 576
def get_user_from_session_key(session_key):
581 577
    '''Get the user logged in an active session'''
582
    from importlib import import_module
583

  
584
    from django.conf import settings
585 578
    from django.contrib.auth import BACKEND_SESSION_KEY, SESSION_KEY, load_backend
586 579
    from django.contrib.auth.models import AnonymousUser
587 580

  
tests/test_all.py
42 42

  
43 43
class SerializerTests(TestCase):
44 44
    def test_generic_foreign_key_natural_key(self):
45
        import json
46

  
47 45
        from django.core import serializers
48 46

  
49 47
        from authentic2.models import Attribute, AttributeValue
......
430 428

  
431 429
    @override_settings(A2_REQUIRED_FIELDS=['username'])
432 430
    def register_with_user(self, user, cred):
433
        from django.contrib.auth import get_user_model
434
        from rest_framework import status, test
435

  
436 431
        # disable existing attributes
437 432
        models.Attribute.objects.update(disabled=True)
438 433

  
......
537 532

  
538 533
    @override_settings(A2_REQUIRED_FIELDS=['username'])
539 534
    def test_email_is_unique_double_registration(self):
540
        from django.contrib.auth import get_user_model
541
        from rest_framework import status, test
542

  
543 535
        # disable existing attributes
544 536
        models.Attribute.objects.update(disabled=True)
545 537

  
......
626 618

  
627 619
    @override_settings(A2_REQUIRED_FIELDS=['username'])
628 620
    def test_email_username_is_unique_double_registration(self):
629
        from django.contrib.auth import get_user_model
630
        from rest_framework import status, test
631

  
632 621
        # disable existing attributes
633 622
        models.Attribute.objects.update(disabled=True)
634 623

  
tests/test_api.py
232 232

  
233 233

  
234 234
def test_api_users_update_with_email_verified(settings, app, admin, simple_user):
235
    from django.contrib.auth import get_user_model
236

  
237 235
    simple_user.email_verified = True
238 236
    simple_user.save()
239 237

  
......
263 261

  
264 262

  
265 263
def test_api_users_update_without_email_verified(settings, app, admin, simple_user):
266
    from django.contrib.auth import get_user_model
267

  
268 264
    simple_user.email_verified = True
269 265
    simple_user.save()
270 266

  
......
292 288

  
293 289

  
294 290
def test_api_users_update_with_same_unique_email(settings, app, admin, simple_user):
295
    from django.contrib.auth import get_user_model
296

  
297 291
    ou = get_default_ou()
298 292
    ou.email_is_unique = True
299 293
    ou.save()
......
313 307

  
314 308

  
315 309
def test_api_users_create_with_email_verified(settings, app, admin):
316
    from django.contrib.auth import get_user_model
317

  
318 310
    payload = {
319 311
        'username': 'janedoe',
320 312
        'email': 'jane.doe@nowhere.null',
......
331 323

  
332 324

  
333 325
def test_api_users_create_without_email_verified(settings, app, admin):
334
    from django.contrib.auth import get_user_model
335

  
336 326
    payload = {
337 327
        'username': 'janedoe',
338 328
        'email': 'jane.doe@nowhere.null',
......
347 337

  
348 338

  
349 339
def test_api_email_unset_verification(settings, app, admin, simple_user):
350
    from django.contrib.auth import get_user_model
351

  
352 340
    simple_user.email_verified = True
353 341
    simple_user.save()
354 342

  
......
378 366

  
379 367

  
380 368
def test_api_users_list_by_authorized_service(app, superuser):
381
    from authentic2.models import Service
382

  
383 369
    app.authorization = ('Basic', (superuser.username, superuser.username))
384 370

  
385 371
    user1 = User.objects.create(username='user1')
......
409 395

  
410 396

  
411 397
def test_api_member_users_list_by_authorized_service(app, superuser, simple_role):
412
    from authentic2.models import Service
413

  
414 398
    app.authorization = ('Basic', (superuser.username, superuser.username))
415 399
    url = reverse('a2-api-role-members-list', kwargs={'role_uuid': simple_role.uuid})
416 400

  
......
476 460

  
477 461

  
478 462
def test_api_users_create(settings, app, api_user):
479
    from django.contrib.auth import get_user_model
480

  
481 463
    at = Attribute.objects.create(kind='title', name='title', label='title')
482 464
    app.authorization = ('Basic', (api_user.username, api_user.username))
483 465
    # test missing first_name
tests/test_ldap.py
821 821

  
822 822

  
823 823
def test_set_mandatory_roles(slapd, settings, db):
824
    from authentic2.a2_rbac.models import Role
825

  
826 824
    Role.objects.get_or_create(name='tech')
827 825
    Role.objects.get_or_create(name='admin')
828 826
    settings.LDAP_AUTH_SETTINGS = [
......
863 861

  
864 862

  
865 863
def test_from_slug_set_mandatory_roles(slapd, settings, db):
866
    from authentic2.a2_rbac.models import Role
867

  
868 864
    Role.objects.get_or_create(name='Tech', slug='tech')
869 865
    Role.objects.get_or_create(name='Admin', slug='admin')
870 866
    settings.LDAP_AUTH_SETTINGS = [
......
886 882

  
887 883

  
888 884
def test_multiple_slug_set_mandatory_roles(slapd, settings, db):
889
    from authentic2.a2_rbac.models import Role
890

  
891 885
    service1 = Service.objects.create(name='s1', slug='s1')
892 886
    service2 = Service.objects.create(name='s2', slug='s2')
893 887
    Role.objects.create(name='foo', slug='tech', service=service1)
......
911 905

  
912 906

  
913 907
def test_multiple_name_set_mandatory_roles(slapd, settings, db):
914
    from authentic2.a2_rbac.models import Role
915

  
916 908
    OU = get_ou_model()
917 909
    ou1 = OU.objects.create(name='test1', slug='test1')
918 910
    ou2 = OU.objects.create(name='test2', slug='test2')
tests/test_user_manager.py
1076 1076
    * try to remove a service consent
1077 1077
    """
1078 1078
    from authentic2.a2_rbac.models import MANAGE_AUTHORIZATIONS_OP
1079
    from django_rbac.models import VIEW_OP
1080
    from django_rbac.utils import get_operation, get_permission_model, get_role_model
1081 1079
    from tests.conftest import create_user
1082 1080

  
1083 1081
    Role = get_role_model()
1084
-