diff --git a/eav/admin.py b/eav/admin.py index 884d297..ea88fc9 100644 --- a/eav/admin.py +++ b/eav/admin.py @@ -1,8 +1,8 @@ '''Admin. This module contains classes used for admin integration.''' from django.contrib import admin -from django.contrib.admin.options import (InlineModelAdmin, ModelAdmin, - StackedInline) +from django.contrib.admin.options import InlineModelAdmin +from django.contrib.admin.options import ModelAdmin from django.forms.models import BaseInlineFormSet from django.utils.safestring import mark_safe diff --git a/eav/forms.py b/eav/forms.py index dc1a622..eeb1f9b 100644 --- a/eav/forms.py +++ b/eav/forms.py @@ -4,7 +4,7 @@ from copy import deepcopy from django.contrib.admin.widgets import AdminSplitDateTime from django.forms import (BooleanField, CharField, ChoiceField, DateTimeField, - FloatField, IntegerField, ModelForm, ValidationError) + FloatField, IntegerField, ModelForm) from django.utils.translation import ugettext_lazy as _ diff --git a/eav/queryset.py b/eav/queryset.py index 413a300..254a7bd 100644 --- a/eav/queryset.py +++ b/eav/queryset.py @@ -21,8 +21,7 @@ Q-expressions need to be rewritten for two reasons: For details see: ``rewrite_q_expr``. ''' -import sys -from functools import reduce, wraps +from functools import wraps from django.db import models from django.db.models import Q diff --git a/eav/registry.py b/eav/registry.py index 8b463ac..73a97f8 100644 --- a/eav/registry.py +++ b/eav/registry.py @@ -1,8 +1,7 @@ '''Registry. This modules contains the registry classes.''' from django.contrib.contenttypes import fields as generic -from django.db.models.signals import post_init, post_save, pre_init, pre_save -from django.db.utils import DatabaseError +from django.db.models.signals import post_init, post_save, pre_save from .managers import EntityManager from .models import Attribute, Entity, Value diff --git a/eav/validators.py b/eav/validators.py index 090603f..0456a97 100644 --- a/eav/validators.py +++ b/eav/validators.py @@ -16,7 +16,6 @@ import datetime from django.core.exceptions import ValidationError from django.db import models -from django.utils import timezone from django.utils.translation import ugettext_lazy as _ diff --git a/tests/data_validation.py b/tests/data_validation.py index f23af11..501a35c 100644 --- a/tests/data_validation.py +++ b/tests/data_validation.py @@ -5,10 +5,9 @@ from django.core.exceptions import ValidationError from django.contrib.auth.models import User import eav -from eav.registry import EavConfig from eav.models import Attribute, Value, EnumValue, EnumGroup -from .models import Patient, Encounter +from .models import Patient class DataValidation(TestCase): diff --git a/tests/queries.py b/tests/queries.py index 81c7e65..d811db3 100644 --- a/tests/queries.py +++ b/tests/queries.py @@ -1,13 +1,11 @@ -from django.contrib.auth.models import User from django.core.exceptions import MultipleObjectsReturned from django.db.models import Q from django.test import TestCase import eav from eav.models import Attribute, EnumGroup, EnumValue, Value -from eav.registry import EavConfig -from .models import Encounter, ExampleModel, Patient +from .models import Encounter, Patient class Queries(TestCase): diff --git a/tests/registry.py b/tests/registry.py index 5b8b392..21113f1 100644 --- a/tests/registry.py +++ b/tests/registry.py @@ -1,9 +1,7 @@ from django.test import TestCase import eav -from eav.registry import Registry, EavConfig -from eav.managers import EntityManager -from eav.models import Attribute +from eav.registry import EavConfig from .models import Patient, Encounter, ExampleModel @@ -28,7 +26,7 @@ class RegistryTests(TestCase): return 'testing' eav.register(Encounter, EncounterEav) - + def test_registering_with_defaults(self): eav.register(Patient) self.assertTrue(hasattr(Patient, '_eav_config_cls')) diff --git a/tests/set_and_get.py b/tests/set_and_get.py index 7c21a38..986f4c9 100644 --- a/tests/set_and_get.py +++ b/tests/set_and_get.py @@ -1,8 +1,7 @@ from django.test import TestCase import eav -from eav.registry import Registry, EavConfig -from eav.managers import EntityManager +from eav.registry import EavConfig from .models import Patient, Encounter