From 6e59a6964e32532238450ee46773e2718ca246b4 Mon Sep 17 00:00:00 2001
From: Valentin Deniaud <vdeniaud@entrouvert.com>
Date: Mon, 20 Sep 2021 14:45:56 +0200
Subject: [PATCH 12/59] misc: fix ungrouped-imports pylint error (#56982)

---
 src/authentic2/a2_rbac/models.py                      | 11 ++---------
 .../management/commands/check-and-repair.py           |  4 ++--
 src/authentic2/models.py                              |  6 +-----
 src/authentic2/saml/models.py                         | 11 +----------
 4 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/authentic2/a2_rbac/models.py b/src/authentic2/a2_rbac/models.py
index 3ac835a9..b594095a 100644
--- a/src/authentic2/a2_rbac/models.py
+++ b/src/authentic2/a2_rbac/models.py
@@ -16,6 +16,7 @@
 
 from collections import namedtuple
 
+from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
@@ -24,7 +25,7 @@ from django.utils.text import slugify
 from django.utils.translation import pgettext_lazy
 from django.utils.translation import ugettext_lazy as _
 
-from authentic2.decorators import errorcollector
+from authentic2.decorators import GlobalCache, errorcollector
 from django_rbac import utils as rbac_utils
 from django_rbac.models import (
     VIEW_OP,
@@ -35,14 +36,6 @@ from django_rbac.models import (
     RoleParentingAbstractBase,
 )
 
-try:
-    from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
-except ImportError:
-    # Django < 1.8
-    from django.contrib.contenttypes.generic import GenericForeignKey, GenericRelation
-
-from authentic2.decorators import GlobalCache
-
 from . import app_settings, fields, managers
 
 
diff --git a/src/authentic2/management/commands/check-and-repair.py b/src/authentic2/management/commands/check-and-repair.py
index 6e84c4e3..2bc2acc8 100644
--- a/src/authentic2/management/commands/check-and-repair.py
+++ b/src/authentic2/management/commands/check-and-repair.py
@@ -31,14 +31,14 @@ from django.utils.timezone import localtime
 from authentic2 import app_settings
 from authentic2.a2_rbac.models import OrganizationalUnit as OU
 from authentic2.a2_rbac.models import Permission, Role
+from authentic2.custom_user.models import User
 from django_rbac.models import ADMIN_OP
 from django_rbac.utils import get_operation
 
 try:
-    from authentic2.a2_rbac.models import MANAGE_MEMBERS_OP
+    from authentic2.a2_rbac.models import MANAGE_MEMBERS_OP  # pylint: disable=C0412
 except ImportError:
     MANAGE_MEMBERS_OP = None
-from authentic2.custom_user.models import User
 
 MULTITENANT = 'hobo.multitenant' in settings.INSTALLED_APPS
 if MULTITENANT:
diff --git a/src/authentic2/models.py b/src/authentic2/models.py
index fb42e07b..ed50a14b 100644
--- a/src/authentic2/models.py
+++ b/src/authentic2/models.py
@@ -21,6 +21,7 @@ import uuid
 
 import django
 from django.conf import settings
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.fields import jsonb
 from django.contrib.postgres.indexes import GinIndex
@@ -37,11 +38,6 @@ from authentic2.a2_rbac.models import Role
 from authentic2.crypto import base64url_decode, base64url_encode
 from django_rbac.utils import get_role_model_name
 
-try:
-    from django.contrib.contenttypes.fields import GenericForeignKey
-except ImportError:
-    from django.contrib.contenttypes.generic import GenericForeignKey
-
 # install our natural_key implementation
 from . import managers
 from . import natural_key as unused_natural_key  # noqa: F401
diff --git a/src/authentic2/saml/models.py b/src/authentic2/saml/models.py
index 3bbf8c40..fea57ca9 100644
--- a/src/authentic2/saml/models.py
+++ b/src/authentic2/saml/models.py
@@ -20,6 +20,7 @@ import xml.etree.ElementTree as etree
 
 import requests
 from django.conf import settings
+from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import models
@@ -29,16 +30,6 @@ from django.utils.encoding import force_str, force_text
 from django.utils.translation import ugettext_lazy as _
 
 from authentic2.compat_lasso import lasso
-
-try:
-    from django.contrib.contenttypes.fields import GenericForeignKey
-except ImportError:
-    from django.contrib.contenttypes.generic import GenericForeignKey
-try:
-    from django.contrib.contenttypes.fields import GenericRelation
-except ImportError:
-    from django.contrib.contenttypes.generic import GenericRelation
-
 from authentic2.saml.fields import MultiSelectField, PickledObjectField
 
 from .. import managers as a2_managers
-- 
2.30.2