Shorten names for everything

README.rst

@@ -228,6 +228,7 @@ Besides ``LocalizedField``, there's also:
 
 * ``LocalizedBleachField``
      Automatically bleaches the content of the field.
+
           * django-bleach
 
      Example usage:

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 = {

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'
     ]

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):

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):

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):

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):

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
 
 

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):

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
 
 

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:

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:

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):

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
 

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
 
 

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):