diff --git a/README.rst b/README.rst index d70d996..4c8e6bd 100644 --- a/README.rst +++ b/README.rst @@ -228,6 +228,7 @@ Besides ``LocalizedField``, there's also: * ``LocalizedBleachField`` Automatically bleaches the content of the field. + * django-bleach Example usage: diff --git a/localized_fields/admin.py b/localized_fields/admin.py index fdb2227..5677de6 100644 --- a/localized_fields/admin.py +++ b/localized_fields/admin.py @@ -1,7 +1,7 @@ from django.contrib.admin import ModelAdmin -from .fields import LocalizedField from . import widgets +from .fields import LocalizedField FORMFIELD_FOR_LOCALIZED_FIELDS_DEFAULTS = { diff --git a/localized_fields/localized_descriptor.py b/localized_fields/descriptor.py similarity index 100% rename from localized_fields/localized_descriptor.py rename to localized_fields/descriptor.py diff --git a/localized_fields/fields/__init__.py b/localized_fields/fields/__init__.py index a634894..d23188e 100644 --- a/localized_fields/fields/__init__.py +++ b/localized_fields/fields/__init__.py @@ -1,6 +1,6 @@ -from .localized_field import LocalizedField -from .localized_autoslug_field import LocalizedAutoSlugField -from .localized_uniqueslug_field import LocalizedUniqueSlugField +from .field import LocalizedField +from .autoslug_field import LocalizedAutoSlugField +from .uniqueslug_field import LocalizedUniqueSlugField __all__ = [ @@ -10,7 +10,7 @@ __all__ = [ ] try: - from .localized_bleach_field import LocalizedBleachField + from .bleach_field import LocalizedBleachField __all__ += [ 'LocalizedBleachField' ] diff --git a/localized_fields/fields/localized_autoslug_field.py b/localized_fields/fields/autoslug_field.py similarity index 97% rename from localized_fields/fields/localized_autoslug_field.py rename to localized_fields/fields/autoslug_field.py index 8ce26db..d7ef10c 100644 --- a/localized_fields/fields/localized_autoslug_field.py +++ b/localized_fields/fields/autoslug_field.py @@ -5,8 +5,8 @@ from django import forms from django.conf import settings from django.utils.text import slugify -from .localized_field import LocalizedField -from ..localized_value import LocalizedValue +from .field import LocalizedField +from ..value import LocalizedValue class LocalizedAutoSlugField(LocalizedField): diff --git a/localized_fields/fields/localized_bleach_field.py b/localized_fields/fields/bleach_field.py similarity index 95% rename from localized_fields/fields/localized_bleach_field.py rename to localized_fields/fields/bleach_field.py index 92fad99..3535de7 100644 --- a/localized_fields/fields/localized_bleach_field.py +++ b/localized_fields/fields/bleach_field.py @@ -1,8 +1,9 @@ import bleach + from django.conf import settings from django_bleach.utils import get_bleach_default_options -from .localized_field import LocalizedField +from .field import LocalizedField class LocalizedBleachField(LocalizedField): diff --git a/localized_fields/fields/localized_field.py b/localized_fields/fields/field.py similarity index 98% rename from localized_fields/fields/localized_field.py rename to localized_fields/fields/field.py index 29a23c8..4b476f6 100644 --- a/localized_fields/fields/localized_field.py +++ b/localized_fields/fields/field.py @@ -8,8 +8,8 @@ from django.db.utils import IntegrityError from psqlextra.fields import HStoreField from ..forms import LocalizedFieldForm -from ..localized_value import LocalizedValue -from ..localized_descriptor import LocalizedValueDescriptor +from ..value import LocalizedValue +from ..descriptor import LocalizedValueDescriptor class LocalizedField(HStoreField): diff --git a/localized_fields/fields/localized_uniqueslug_field.py b/localized_fields/fields/uniqueslug_field.py similarity index 96% rename from localized_fields/fields/localized_uniqueslug_field.py rename to localized_fields/fields/uniqueslug_field.py index a5ac993..2b2cbe1 100644 --- a/localized_fields/fields/localized_uniqueslug_field.py +++ b/localized_fields/fields/uniqueslug_field.py @@ -4,10 +4,10 @@ from django.conf import settings from django.utils.text import slugify from django.core.exceptions import ImproperlyConfigured +from .autoslug_field import LocalizedAutoSlugField from ..util import get_language_codes from ..mixins import AtomicSlugRetryMixin -from ..localized_value import LocalizedValue -from .localized_autoslug_field import LocalizedAutoSlugField +from ..value import LocalizedValue class LocalizedUniqueSlugField(LocalizedAutoSlugField): diff --git a/localized_fields/forms.py b/localized_fields/forms.py index 2475673..86d35b3 100644 --- a/localized_fields/forms.py +++ b/localized_fields/forms.py @@ -3,7 +3,7 @@ from typing import List from django import forms from django.conf import settings -from .localized_value import LocalizedValue +from .value import LocalizedValue from .widgets import LocalizedFieldWidget diff --git a/localized_fields/localized_value.py b/localized_fields/value.py similarity index 100% rename from localized_fields/localized_value.py rename to localized_fields/value.py diff --git a/localized_fields/widgets.py b/localized_fields/widgets.py index 36e9280..ade2b6f 100644 --- a/localized_fields/widgets.py +++ b/localized_fields/widgets.py @@ -5,7 +5,7 @@ from django import forms from django.contrib.admin import widgets from django.template.loader import render_to_string -from .localized_value import LocalizedValue +from .value import LocalizedValue class LocalizedFieldWidget(forms.MultiWidget): diff --git a/tests/fake_model.py b/tests/fake_model.py index 04e59d8..5456219 100644 --- a/tests/fake_model.py +++ b/tests/fake_model.py @@ -16,7 +16,7 @@ def define_fake_model(name='TestModel', fields=None): if fields: attributes.update(fields) - model = type(name, (AtomicSlugRetryMixin,LocalizedModel,), attributes) + model = type(name, (LocalizedModel,), attributes) return model diff --git a/tests/test_localized_bleach_field.py b/tests/test_bleach_field.py similarity index 96% rename from tests/test_localized_bleach_field.py rename to tests/test_bleach_field.py index 765a507..0901d3f 100644 --- a/tests/test_localized_bleach_field.py +++ b/tests/test_bleach_field.py @@ -1,9 +1,11 @@ +import bleach + from django.conf import settings from django.test import TestCase from django_bleach.utils import get_bleach_default_options -import bleach -from localized_fields import LocalizedBleachField, LocalizedValue +from localized_fields.fields import LocalizedBleachField +from localized_fields.value import LocalizedValue class TestModel: diff --git a/tests/test_localized_field.py b/tests/test_field.py similarity index 98% rename from tests/test_localized_field.py rename to tests/test_field.py index 9d625ec..7af76c8 100644 --- a/tests/test_localized_field.py +++ b/tests/test_field.py @@ -1,10 +1,13 @@ import json + from django.conf import settings from django.db.utils import IntegrityError from django.test import TestCase from django.utils import translation -from localized_fields import LocalizedField, LocalizedFieldForm, LocalizedValue +from localized_fields.fields import LocalizedField +from localized_fields.forms import LocalizedFieldForm +from localized_fields.value import LocalizedValue def get_init_values() -> dict: diff --git a/tests/test_localized_field_form.py b/tests/test_form.py similarity index 94% rename from tests/test_localized_field_form.py rename to tests/test_form.py index abc79c7..a5b1157 100644 --- a/tests/test_localized_field_form.py +++ b/tests/test_form.py @@ -1,7 +1,7 @@ from django.conf import settings from django.test import TestCase -from localized_fields import LocalizedFieldForm +from localized_fields.forms import LocalizedFieldForm class LocalizedFieldFormTestCase(TestCase): diff --git a/tests/test_localized_model.py b/tests/test_model.py similarity index 93% rename from tests/test_localized_model.py rename to tests/test_model.py index 908684c..f9c31ce 100644 --- a/tests/test_localized_model.py +++ b/tests/test_model.py @@ -1,6 +1,7 @@ from django.test import TestCase -from localized_fields import LocalizedField, LocalizedValue +from localized_fields.fields import LocalizedField +from localized_fields.value import LocalizedValue from .fake_model import get_fake_model diff --git a/tests/test_localized_slug_fields.py b/tests/test_slug_fields.py similarity index 98% rename from tests/test_localized_slug_fields.py rename to tests/test_slug_fields.py index 51fac26..a2f25ad 100644 --- a/tests/test_localized_slug_fields.py +++ b/tests/test_slug_fields.py @@ -4,10 +4,14 @@ from django import forms from django.conf import settings from django.test import TestCase from django.db.utils import IntegrityError -from localized_fields import (LocalizedField, LocalizedAutoSlugField, - LocalizedUniqueSlugField) from django.utils.text import slugify +from localized_fields.fields import ( + LocalizedField, + LocalizedAutoSlugField, + LocalizedUniqueSlugField +) + from .fake_model import get_fake_model diff --git a/tests/test_localized_field_widget.py b/tests/test_widget.py similarity index 92% rename from tests/test_localized_field_widget.py rename to tests/test_widget.py index 2e65ac8..a1ed753 100644 --- a/tests/test_localized_field_widget.py +++ b/tests/test_widget.py @@ -1,7 +1,8 @@ from django.conf import settings from django.test import TestCase -from localized_fields import LocalizedFieldWidget, LocalizedValue +from localized_fields.value import LocalizedValue +from localized_fields.widgets import LocalizedFieldWidget class LocalizedFieldWidgetTestCase(TestCase):