From 302a64a02c181238b20b8790c9102df5fc81b109 Mon Sep 17 00:00:00 2001 From: Swen Kooij Date: Fri, 3 Feb 2017 10:40:37 +0200 Subject: [PATCH] Updated base classes in documentation --- README.rst | 33 ++++++++++--------- .../fields/localized_uniqueslug_field.py | 4 +-- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/README.rst b/README.rst index 2bf5e33..b00d989 100644 --- a/README.rst +++ b/README.rst @@ -146,14 +146,14 @@ At the moment, it is not possible to select two languages to be marked as requir .. code-block:: python - class MyModel(models.Model): + class MyModel(LocalizedModel): title = LocalizedField(required=True) * Make all languages optional: .. code-block:: python - class MyModel(models.Model): + class MyModel(LocalizedModel): title = LocalizedField(null=True) **Uniqueness** @@ -164,7 +164,7 @@ By default the values stored in a ``LocalizedField`` are *not unique*. You can e .. code-block:: python - class MyModel(models.Model): + class MyModel(LocalizedModel): title = LocalizedField(uniqueness=['en', 'ro']) * Enforce uniqueness for **all** languages: @@ -173,14 +173,14 @@ By default the values stored in a ``LocalizedField`` are *not unique*. You can e from localized_fields import get_language_codes - class MyModel(models.Model): + class MyModel(LocalizedModel): title = LocalizedField(uniqueness=get_language_codes()) * Enforce uniqueness for one ore more languages **together** (similar to Django's ``unique_together``): .. code-block:: python - class MyModel(models.Model): + class MyModel(LocalizedModel): title = LocalizedField(uniqueness=[('en', 'ro')]) * Enforce uniqueness for **all** languages **together**: @@ -189,7 +189,7 @@ By default the values stored in a ``LocalizedField`` are *not unique*. You can e from localized_fields import get_language_codes - class MyModel(models.Model): + class MyModel(LocalizedModel): title = LocalizedField(uniqueness=[(*get_language_codes())]) @@ -203,11 +203,12 @@ Besides ``LocalizedField``, there's also: .. code-block:: python - from localized_fields.models import LocalizedModel - from localized_fields.fields import (LocalizedField, - LocalizedUniqueSlugField) + from localized_fields import (LocalizedModel, + AtomicSlugRetryMixin, + LocalizedField, + LocalizedUniqueSlugField) - class MyModel(LocalizedModel): + class MyModel(AtomicSlugRetryMixin, LocalizedModel): title = LocalizedField() slug = LocalizedUniqueSlugField(populate_from='title') @@ -218,9 +219,9 @@ Besides ``LocalizedField``, there's also: .. code-block:: python - from localized_fields.models import LocalizedModel - from localized_fields.fields import (LocalizedField, - LocalizedAutoSlugField) + from localized_fields import (LocalizedModel, + LocalizedField, + LocalizedUniqueSlugField) class MyModel(LocalizedModel): title = LocalizedField() @@ -236,9 +237,9 @@ Besides ``LocalizedField``, there's also: .. code-block:: python - from localized_fields.models import LocalizedModel - from localized_fields.fields import (LocalizedField, - LocalizedBleachField) + from localized_fields import (LocalizedModel, + LocalizedField, + LocalizedBleachField) class MyModel(LocalizedModel): title = LocalizedField() diff --git a/localized_fields/fields/localized_uniqueslug_field.py b/localized_fields/fields/localized_uniqueslug_field.py index 0506907..8bc4cc2 100644 --- a/localized_fields/fields/localized_uniqueslug_field.py +++ b/localized_fields/fields/localized_uniqueslug_field.py @@ -29,12 +29,12 @@ class LocalizedUniqueSlugField(LocalizedAutoSlugField): self.populate_from = kwargs.pop('populate_from') kwargs['uniqueness'] = kwargs.pop('uniqueness', get_language_codes()) - super(LocalizedAutoSlugField, self).__init__( + super(LocalizedUniqueSlugField, self).__init__( *args, **kwargs ) - def pre_save(self, instance, add: bool): + def pre_save(self, instance, _add: bool): """Ran just before the model is saved, allows us to built the slug.