diff --git a/eav/__init__.py b/eav/__init__.py index 3988f12..af09550 100644 --- a/eav/__init__.py +++ b/eav/__init__.py @@ -1,10 +1,10 @@ def register(model_cls, config_cls=None): - from .registry import Registry + from eav.registry import Registry Registry.register(model_cls, config_cls) def unregister(model_cls): - from .registry import Registry + from eav.registry import Registry Registry.unregister(model_cls) diff --git a/eav/admin.py b/eav/admin.py index 48a6710..a19f795 100644 --- a/eav/admin.py +++ b/eav/admin.py @@ -5,7 +5,7 @@ from django.contrib.admin.options import InlineModelAdmin, ModelAdmin from django.forms.models import BaseInlineFormSet from django.utils.safestring import mark_safe -from .models import Attribute, EnumGroup, EnumValue, Value +from eav.models import Attribute, EnumGroup, EnumValue, Value class BaseEntityAdmin(ModelAdmin): diff --git a/eav/decorators.py b/eav/decorators.py index 5f17d11..c67abdd 100644 --- a/eav/decorators.py +++ b/eav/decorators.py @@ -15,7 +15,7 @@ def register_eav(**kwargs): """ from django.db.models import Model - from . import register + from eav import register def _model_eav_wrapper(model_class): if not issubclass(model_class, Model): diff --git a/eav/fields.py b/eav/fields.py index 3d5c3c3..6630c40 100644 --- a/eav/fields.py +++ b/eav/fields.py @@ -4,7 +4,7 @@ from django.core.exceptions import ValidationError from django.db import models from django.utils.translation import gettext_lazy as _ -from .forms import CSVFormField +from eav.forms import CSVFormField class EavSlugField(models.SlugField): diff --git a/eav/forms.py b/eav/forms.py index 9c15506..0e3e00d 100644 --- a/eav/forms.py +++ b/eav/forms.py @@ -21,7 +21,7 @@ try: except: JSONField = CharField -from .widgets import CSVWidget +from eav.widgets import CSVWidget class CSVFormField(forms.Field): diff --git a/eav/managers.py b/eav/managers.py index 6599225..300de59 100644 --- a/eav/managers.py +++ b/eav/managers.py @@ -4,7 +4,7 @@ This module contains the custom manager used by entities registered with eav. from django.db import models -from .queryset import EavQuerySet +from eav.queryset import EavQuerySet class EntityManager(models.Manager): diff --git a/eav/models.py b/eav/models.py index 30a06b6..ecedab0 100644 --- a/eav/models.py +++ b/eav/models.py @@ -25,10 +25,10 @@ try: except ImportError: from django_jsonfield_backport.models import JSONField -from . import register -from .exceptions import IllegalAssignmentException -from .fields import CSVField, EavDatatypeField, EavSlugField -from .validators import ( +from eav import register +from eav.exceptions import IllegalAssignmentException +from eav.fields import CSVField, EavDatatypeField, EavSlugField +from eav.validators import ( validate_bool, validate_csv, validate_date, diff --git a/eav/queryset.py b/eav/queryset.py index c40ac2e..300932e 100644 --- a/eav/queryset.py +++ b/eav/queryset.py @@ -22,17 +22,12 @@ Q-expressions need to be rewritten for two reasons: from functools import wraps from itertools import count -from django.core.exceptions import ( - FieldDoesNotExist, - FieldError, - ObjectDoesNotExist, -) -from django.db import models +from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist 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, EnumValue, Value +from eav.models import Attribute, EnumValue, Value def is_eav_and_leaf(expr, gr_name): diff --git a/eav/registry.py b/eav/registry.py index 7c194e9..4c3ba6d 100644 --- a/eav/registry.py +++ b/eav/registry.py @@ -3,8 +3,8 @@ from django.contrib.contenttypes import fields as generic from django.db.models.signals import post_init, post_save, pre_save -from .managers import EntityManager -from .models import Attribute, Entity, Value +from eav.managers import EntityManager +from eav.models import Attribute, Entity, Value class EavConfig(object): diff --git a/eav/validators.py b/eav/validators.py index d71f879..136fa0c 100644 --- a/eav/validators.py +++ b/eav/validators.py @@ -82,7 +82,7 @@ def validate_enum(value): Raises ``ValidationError`` unless *value* is a saved :class:`~eav.models.EnumValue` model instance. """ - from .models import EnumValue + from eav.models import EnumValue if isinstance(value, EnumValue) and not value.pk: raise ValidationError(_(u"EnumValue has not been saved yet"))