trivial: remove old django-compatibility support code (#60387)

src/authentic2/utils/misc.py

@@ -33,7 +33,7 @@ from django.contrib.auth import authenticate as dj_authenticate
 from django.contrib.auth import get_user_model
 from django.contrib.auth import login as auth_login
 from django.core import signing
-from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured
 from django.core.mail import EmailMessage, send_mail
 from django.forms.utils import ErrorList, to_current_timezone
 from django.http import HttpResponse, HttpResponseRedirect
@@ -47,12 +47,6 @@ from django.utils.encoding import iri_to_uri, uri_to_iri
 from django.utils.formats import localize
 from django.utils.translation import ungettext
 
-try:
-    from django.core.exceptions import FieldDoesNotExist
-except ImportError:
-    # Django < 1.8
-    from django.db.models.fields import FieldDoesNotExist
-
 from authentic2.saml.saml2utils import filter_attribute_private_key, filter_element_private_key
 
 from .. import app_settings, constants, crypto, plugins
@@ -312,7 +306,6 @@ def make_url(
     scheme, netloc, path, query_string, o_fragment = urllib.parse.urlsplit(url)
     url = uri_to_iri(urllib.parse.urlunsplit((scheme, netloc, path, '', '')))
     fragment = fragment or o_fragment
-    # Django < 1.6 compat, query_string is not optional
     url_params = QueryDict(query_string=query_string, mutable=True)
     if keep_params:
         assert request is not None, 'missing request'

src/authentic2_idp_cas/admin.py

@@ -19,8 +19,6 @@ from django.contrib import admin
 from django.utils.translation import ugettext as _
 
 from authentic2.admin import CleanupAdminMixin
-
-# Django < 1.7 compat
 from authentic2.attributes_ng.engine import get_attribute_names
 from authentic2.decorators import to_iter
 

src/django_rbac/backends.py

@@ -3,14 +3,9 @@ import functools
 
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
+from django.core.exceptions import FieldDoesNotExist
 from django.db.models.query import Q
 
-try:
-    from django.core.exceptions import FieldDoesNotExist
-except ImportError:
-    # Django < 1.8
-    from django.db.models.fields import FieldDoesNotExist
-
 from . import utils
 
 

src/django_rbac/models.py

@@ -3,23 +3,17 @@ import hashlib
 import operator
 
 from django.conf import settings
-from django.db import models
-from django.db.models.query import Prefetch, Q
-from django.utils.translation import gettext
-from django.utils.translation import ugettext_lazy as _
-
-try:
-    from django.contrib.contenttypes.fields import GenericForeignKey
-except ImportError:
-    # Django < 1.8
-    from django.contrib.contenttypes.generic import GenericForeignKey
-
 from django.contrib import auth
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.contrib.auth.models import Permission as AuthPermission
 from django.contrib.auth.models import _user_get_all_permissions, _user_has_module_perms, _user_has_perm
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
+from django.db import models
+from django.db.models.query import Prefetch, Q
+from django.utils.translation import gettext
+from django.utils.translation import ugettext_lazy as _
 
 from . import backends, constants, managers, utils