From 836695faccfe8d3618728fb208c20062f5a1e73c Mon Sep 17 00:00:00 2001
From: Emmanuel Cazenave <ecazenave@entrouvert.com>
Date: Tue, 31 Jul 2018 14:08:59 +0200
Subject: [PATCH] django 1.11: fix some imports (#21489)

---
 src/authentic2/manager/views.py              | 13 +++++++++++--
 src/authentic2/models.py                     |  3 ++-
 src/authentic2/registration_backend/forms.py |  1 -
 src/authentic2/views.py                      |  1 -
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/authentic2/manager/views.py b/src/authentic2/manager/views.py
index 8bf3757be..568dde247 100644
--- a/src/authentic2/manager/views.py
+++ b/src/authentic2/manager/views.py
@@ -4,7 +4,6 @@ import inspect
 from django.core.exceptions import PermissionDenied
 from django.db import transaction
 from django.views.generic.base import ContextMixin
-from django.views.generic.edit import FormMixinBase
 from django.views.generic import (FormView, UpdateView, CreateView, DeleteView, TemplateView,
                                   DetailView, View)
 from django.views.generic.detail import SingleObjectMixin
@@ -33,7 +32,17 @@ from authentic2 import hooks
 from . import app_settings, utils
 
 
-class MediaMixinBase(MediaDefiningClass, FormMixinBase):
+# https://github.com/MongoEngine/django-mongoengine/blob/master/django_mongoengine/views/edit.py
+import django.views.generic.edit
+
+try:
+    FormMixin = django.views.generic.edit.FormMixinBase
+except AttributeError:
+    # django >= 1.10
+    FormMixin = django.views.generic.edit.FormMixin
+
+
+class MediaMixinBase(MediaDefiningClass, FormMixin):
     pass
 
 
diff --git a/src/authentic2/models.py b/src/authentic2/models.py
index 60ff655c9..b14f3085d 100644
--- a/src/authentic2/models.py
+++ b/src/authentic2/models.py
@@ -11,7 +11,6 @@ from django.contrib.contenttypes.models import ContentType
 
 from model_utils.managers import QueryManager
 
-from . import attribute_kinds
 from authentic2.a2_rbac.models import Role
 from authentic2.a2_rbac.utils import get_default_ou
 from django_rbac.utils import get_role_model_name
@@ -171,6 +170,7 @@ class Attribute(models.Model):
     user_attributes = QueryManager(user_editable=True)
 
     def get_form_field(self, **kwargs):
+        from . import attribute_kinds
         kwargs['label'] = self.label
         kwargs['required'] = self.required
         if self.description:
@@ -178,6 +178,7 @@ class Attribute(models.Model):
         return attribute_kinds.get_form_field(self.kind, **kwargs)
 
     def get_kind(self):
+        from . import attribute_kinds
         return attribute_kinds.get_kind(self.kind)
 
     def contribute_to_form(self, form, **kwargs):
diff --git a/src/authentic2/registration_backend/forms.py b/src/authentic2/registration_backend/forms.py
index 1c235633c..e0d12f17a 100644
--- a/src/authentic2/registration_backend/forms.py
+++ b/src/authentic2/registration_backend/forms.py
@@ -6,7 +6,6 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _, ugettext
 from django.forms import ModelForm, Form, CharField, PasswordInput, EmailField
-from django.utils.datastructures import SortedDict
 from django.db.models.fields import FieldDoesNotExist
 from django.forms.utils import ErrorList
 
diff --git a/src/authentic2/views.py b/src/authentic2/views.py
index 96514d4db..c9d8d9a7e 100644
--- a/src/authentic2/views.py
+++ b/src/authentic2/views.py
@@ -20,7 +20,6 @@ from django.core.urlresolvers import reverse
 from django.core.exceptions import ValidationError
 from django.contrib import messages
 from django.utils.translation import ugettext as _
-from django.utils.http import urlencode, same_origin
 from django.contrib.auth import logout as auth_logout
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.http import (HttpResponseRedirect, HttpResponseForbidden,