diff --git a/eav/decorators.py b/eav/decorators.py index f600b0d..5f17d11 100644 --- a/eav/decorators.py +++ b/eav/decorators.py @@ -13,9 +13,10 @@ def register_eav(**kwargs): class Author(models.Model): pass """ - from . import register from django.db.models import Model + from . import register + def _model_eav_wrapper(model_class): if not issubclass(model_class, Model): raise ValueError('Wrapped class must subclass Model.') diff --git a/eav/fields.py b/eav/fields.py index c5d4b9d..3d5c3c3 100644 --- a/eav/fields.py +++ b/eav/fields.py @@ -1,7 +1,7 @@ import re -from django.db import models from django.core.exceptions import ValidationError +from django.db import models from django.utils.translation import gettext_lazy as _ from .forms import CSVFormField diff --git a/eav/forms.py b/eav/forms.py index 51030a6..9c15506 100644 --- a/eav/forms.py +++ b/eav/forms.py @@ -4,6 +4,7 @@ from copy import deepcopy from django import forms from django.contrib.admin.widgets import AdminSplitDateTime +from django.core.exceptions import ValidationError from django.forms import ( BooleanField, CharField, @@ -13,7 +14,6 @@ from django.forms import ( IntegerField, ModelForm, ) -from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ try: diff --git a/eav/migrations/0001_initial.py b/eav/migrations/0001_initial.py index 325566c..4b8ad66 100644 --- a/eav/migrations/0001_initial.py +++ b/eav/migrations/0001_initial.py @@ -1,8 +1,9 @@ # Generated by Django 2.0.4 on 2018-06-01 09:36 -from django.db import migrations, models import django.db.models.deletion import django.utils.timezone +from django.db import migrations, models + import eav.fields diff --git a/eav/migrations/0003_auto_20210404_2209.py b/eav/migrations/0003_auto_20210404_2209.py index d5a3e0b..00928c8 100644 --- a/eav/migrations/0003_auto_20210404_2209.py +++ b/eav/migrations/0003_auto_20210404_2209.py @@ -1,8 +1,9 @@ # Generated by Django 3.1.6 on 2021-04-04 22:09 -from django.db import migrations -import eav.fields import django.core.serializers.json +from django.db import migrations + +import eav.fields try: from django.db.models import JSONField diff --git a/eav/migrations/0005_auto_20210510_1305.py b/eav/migrations/0005_auto_20210510_1305.py index 90b8944..4b6d5b6 100644 --- a/eav/migrations/0005_auto_20210510_1305.py +++ b/eav/migrations/0005_auto_20210510_1305.py @@ -1,6 +1,7 @@ # Generated by Django 3.2 on 2021-05-10 13:05 from django.db import migrations + import eav.fields diff --git a/eav/queryset.py b/eav/queryset.py index 788c531..c40ac2e 100644 --- a/eav/queryset.py +++ b/eav/queryset.py @@ -19,17 +19,20 @@ Q-expressions need to be rewritten for two reasons: 2. To ensure that Q-expression tree is compiled to valid SQL. For details see: :func:`rewrite_q_expr`. """ -from itertools import count from functools import wraps +from itertools import count -from django.core.exceptions import FieldDoesNotExist -from django.core.exceptions import FieldError, ObjectDoesNotExist +from django.core.exceptions import ( + FieldDoesNotExist, + FieldError, + ObjectDoesNotExist, +) from django.db import models from django.db.models import Case, IntegerField, Q, When from django.db.models.query import QuerySet from django.db.utils import NotSupportedError -from .models import Attribute, Value, EnumValue +from .models import Attribute, EnumValue, Value def is_eav_and_leaf(expr, gr_name): diff --git a/eav/validators.py b/eav/validators.py index cc0dd9b..d71f879 100644 --- a/eav/validators.py +++ b/eav/validators.py @@ -10,8 +10,8 @@ These validators are called by the :class:`~eav.models.Attribute` model. """ -import json import datetime +import json from django.core.exceptions import ValidationError from django.db import models diff --git a/eav/widgets.py b/eav/widgets.py index d1acc39..e68887e 100644 --- a/eav/widgets.py +++ b/eav/widgets.py @@ -1,6 +1,6 @@ -from django.forms.widgets import Textarea -from django.core.exceptions import ValidationError from django.core import validators +from django.core.exceptions import ValidationError +from django.forms.widgets import Textarea EMPTY_VALUES = validators.EMPTY_VALUES + ('[]',)