django 1.11: fix some imports (#21489)
This commit is contained in:
parent
f1668b2bfb
commit
836695facc
|
@ -4,7 +4,6 @@ import inspect
|
||||||
from django.core.exceptions import PermissionDenied
|
from django.core.exceptions import PermissionDenied
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
from django.views.generic.base import ContextMixin
|
from django.views.generic.base import ContextMixin
|
||||||
from django.views.generic.edit import FormMixinBase
|
|
||||||
from django.views.generic import (FormView, UpdateView, CreateView, DeleteView, TemplateView,
|
from django.views.generic import (FormView, UpdateView, CreateView, DeleteView, TemplateView,
|
||||||
DetailView, View)
|
DetailView, View)
|
||||||
from django.views.generic.detail import SingleObjectMixin
|
from django.views.generic.detail import SingleObjectMixin
|
||||||
|
@ -33,7 +32,17 @@ from authentic2 import hooks
|
||||||
from . import app_settings, utils
|
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
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,6 @@ from django.contrib.contenttypes.models import ContentType
|
||||||
|
|
||||||
from model_utils.managers import QueryManager
|
from model_utils.managers import QueryManager
|
||||||
|
|
||||||
from . import attribute_kinds
|
|
||||||
from authentic2.a2_rbac.models import Role
|
from authentic2.a2_rbac.models import Role
|
||||||
from authentic2.a2_rbac.utils import get_default_ou
|
from authentic2.a2_rbac.utils import get_default_ou
|
||||||
from django_rbac.utils import get_role_model_name
|
from django_rbac.utils import get_role_model_name
|
||||||
|
@ -171,6 +170,7 @@ class Attribute(models.Model):
|
||||||
user_attributes = QueryManager(user_editable=True)
|
user_attributes = QueryManager(user_editable=True)
|
||||||
|
|
||||||
def get_form_field(self, **kwargs):
|
def get_form_field(self, **kwargs):
|
||||||
|
from . import attribute_kinds
|
||||||
kwargs['label'] = self.label
|
kwargs['label'] = self.label
|
||||||
kwargs['required'] = self.required
|
kwargs['required'] = self.required
|
||||||
if self.description:
|
if self.description:
|
||||||
|
@ -178,6 +178,7 @@ class Attribute(models.Model):
|
||||||
return attribute_kinds.get_form_field(self.kind, **kwargs)
|
return attribute_kinds.get_form_field(self.kind, **kwargs)
|
||||||
|
|
||||||
def get_kind(self):
|
def get_kind(self):
|
||||||
|
from . import attribute_kinds
|
||||||
return attribute_kinds.get_kind(self.kind)
|
return attribute_kinds.get_kind(self.kind)
|
||||||
|
|
||||||
def contribute_to_form(self, form, **kwargs):
|
def contribute_to_form(self, form, **kwargs):
|
||||||
|
|
|
@ -6,7 +6,6 @@ from django.conf import settings
|
||||||
from django.core.exceptions import ValidationError
|
from django.core.exceptions import ValidationError
|
||||||
from django.utils.translation import ugettext_lazy as _, ugettext
|
from django.utils.translation import ugettext_lazy as _, ugettext
|
||||||
from django.forms import ModelForm, Form, CharField, PasswordInput, EmailField
|
from django.forms import ModelForm, Form, CharField, PasswordInput, EmailField
|
||||||
from django.utils.datastructures import SortedDict
|
|
||||||
from django.db.models.fields import FieldDoesNotExist
|
from django.db.models.fields import FieldDoesNotExist
|
||||||
from django.forms.utils import ErrorList
|
from django.forms.utils import ErrorList
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,6 @@ from django.core.urlresolvers import reverse
|
||||||
from django.core.exceptions import ValidationError
|
from django.core.exceptions import ValidationError
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.utils.translation import ugettext as _
|
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 logout as auth_logout
|
||||||
from django.contrib.auth import REDIRECT_FIELD_NAME
|
from django.contrib.auth import REDIRECT_FIELD_NAME
|
||||||
from django.http import (HttpResponseRedirect, HttpResponseForbidden,
|
from django.http import (HttpResponseRedirect, HttpResponseForbidden,
|
||||||
|
|
Loading…
Reference in New Issue