diff options
| author | django-bot <ops@djangoproject.com> | 2022-02-03 20:24:19 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2022-02-07 20:37:05 +0100 |
| commit | 9c19aff7c7561e3a82978a272ecdaad40dda5c00 (patch) | |
| tree | f0506b668a013d0063e5fba3dbf4863b466713ba /tests/serializers/models | |
| parent | f68fa8b45dfac545cfc4111d4e52804c86db68d3 (diff) | |
Refs #33476 -- Reformatted code with Black.
Diffstat (limited to 'tests/serializers/models')
| -rw-r--r-- | tests/serializers/models/base.py | 26 | ||||
| -rw-r--r-- | tests/serializers/models/data.py | 22 | ||||
| -rw-r--r-- | tests/serializers/models/multi_table.py | 2 | ||||
| -rw-r--r-- | tests/serializers/models/natural.py | 14 |
4 files changed, 38 insertions, 26 deletions
diff --git a/tests/serializers/models/base.py b/tests/serializers/models/base.py index 0004099f19..af9ca2b20a 100644 --- a/tests/serializers/models/base.py +++ b/tests/serializers/models/base.py @@ -10,7 +10,6 @@ from django.db import models class CategoryMetaDataManager(models.Manager): - def get_by_natural_key(self, kind, name): return self.get(kind=kind, name=name) @@ -22,10 +21,10 @@ class CategoryMetaData(models.Model): objects = CategoryMetaDataManager() class Meta: - unique_together = (('kind', 'name'),) + unique_together = (("kind", "name"),) def __str__(self): - return '[%s:%s]=%s' % (self.kind, self.name, self.value) + return "[%s:%s]=%s" % (self.kind, self.name, self.value) def natural_key(self): return (self.kind, self.name) @@ -33,10 +32,12 @@ class CategoryMetaData(models.Model): class Category(models.Model): name = models.CharField(max_length=20) - meta_data = models.ForeignKey(CategoryMetaData, models.SET_NULL, null=True, default=None) + meta_data = models.ForeignKey( + CategoryMetaData, models.SET_NULL, null=True, default=None + ) class Meta: - ordering = ('name',) + ordering = ("name",) def __str__(self): return self.name @@ -46,7 +47,7 @@ class Author(models.Model): name = models.CharField(max_length=20) class Meta: - ordering = ('name',) + ordering = ("name",) def __str__(self): return self.name @@ -60,7 +61,7 @@ class Article(models.Model): meta_data = models.ManyToManyField(CategoryMetaData) class Meta: - ordering = ('pub_date',) + ordering = ("pub_date",) def __str__(self): return self.headline @@ -78,7 +79,7 @@ class Actor(models.Model): name = models.CharField(max_length=20, primary_key=True) class Meta: - ordering = ('name',) + ordering = ("name",) def __str__(self): return self.name @@ -87,10 +88,10 @@ class Actor(models.Model): class Movie(models.Model): actor = models.ForeignKey(Actor, models.CASCADE) title = models.CharField(max_length=50) - price = models.DecimalField(max_digits=6, decimal_places=2, default=Decimal('0.00')) + price = models.DecimalField(max_digits=6, decimal_places=2, default=Decimal("0.00")) class Meta: - ordering = ('title',) + ordering = ("title",) def __str__(self): return self.title @@ -112,7 +113,6 @@ class Team: class TeamField(models.CharField): - def __init__(self): super().__init__(max_length=100) @@ -132,7 +132,7 @@ class TeamField(models.CharField): def deconstruct(self): name, path, args, kwargs = super().deconstruct() - del kwargs['max_length'] + del kwargs["max_length"] return name, path, args, kwargs @@ -142,7 +142,7 @@ class Player(models.Model): team = TeamField() def __str__(self): - return '%s (%d) playing for %s' % (self.name, self.rank, self.team.to_string()) + return "%s (%d) playing for %s" % (self.name, self.rank, self.team.to_string()) class BaseModel(models.Model): diff --git a/tests/serializers/models/data.py b/tests/serializers/models/data.py index 94c4a215fc..3d863a3fb2 100644 --- a/tests/serializers/models/data.py +++ b/tests/serializers/models/data.py @@ -6,9 +6,7 @@ The basic idea is to have a model for each Django data type. """ import uuid -from django.contrib.contenttypes.fields import ( - GenericForeignKey, GenericRelation, -) +from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation from django.contrib.contenttypes.models import ContentType from django.db import models @@ -62,6 +60,7 @@ class IntegerData(models.Model): class BigIntegerData(models.Model): data = models.BigIntegerField(null=True) + # class ImageData(models.Model): # data = models.ImageField(null=True) @@ -100,6 +99,7 @@ class TimeData(models.Model): class Tag(models.Model): """A tag on an item.""" + data = models.SlugField() content_type = models.ForeignKey(ContentType, models.CASCADE) object_id = models.PositiveIntegerField() @@ -115,6 +115,7 @@ class GenericData(models.Model): tags = GenericRelation(Tag) + # The following test classes are all for validation # of related objects; in particular, forward, backward, # and self references. @@ -127,7 +128,7 @@ class Anchor(models.Model): data = models.CharField(max_length=30) class Meta: - ordering = ('id',) + ordering = ("id",) class UniqueAnchor(models.Model): @@ -151,15 +152,15 @@ class O2OData(models.Model): class FKSelfData(models.Model): - data = models.ForeignKey('self', models.CASCADE, null=True) + data = models.ForeignKey("self", models.CASCADE, null=True) class M2MSelfData(models.Model): - data = models.ManyToManyField('self', symmetrical=False) + data = models.ManyToManyField("self", symmetrical=False) class FKDataToField(models.Model): - data = models.ForeignKey(UniqueAnchor, models.SET_NULL, null=True, to_field='data') + data = models.ForeignKey(UniqueAnchor, models.SET_NULL, null=True, to_field="data") class FKDataToO2O(models.Model): @@ -167,7 +168,7 @@ class FKDataToO2O(models.Model): class M2MIntermediateData(models.Model): - data = models.ManyToManyField(Anchor, through='Intermediate') + data = models.ManyToManyField(Anchor, through="Intermediate") class Intermediate(models.Model): @@ -175,6 +176,7 @@ class Intermediate(models.Model): right = models.ForeignKey(Anchor, models.CASCADE) extra = models.CharField(max_length=30, blank=True, default="doesn't matter") + # The following test classes are for validating the # deserialization of objects that use a user-defined # field as the primary key. @@ -206,6 +208,7 @@ class DecimalPKData(models.Model): class EmailPKData(models.Model): data = models.EmailField(primary_key=True) + # class FilePKData(models.Model): # data = models.FileField(primary_key=True) @@ -221,6 +224,7 @@ class FloatPKData(models.Model): class IntegerPKData(models.Model): data = models.IntegerField(primary_key=True) + # class ImagePKData(models.Model): # data = models.ImageField(primary_key=True) @@ -244,6 +248,7 @@ class SlugPKData(models.Model): class SmallPKData(models.Model): data = models.SmallIntegerField(primary_key=True) + # class TextPKData(models.Model): # data = models.TextField(primary_key=True) @@ -283,6 +288,7 @@ class ModifyingSaveData(models.Model): self.data = 666 super().save(*args, **kwargs) + # Tests for serialization of models using inheritance. # Regression for #7202, #7350 diff --git a/tests/serializers/models/multi_table.py b/tests/serializers/models/multi_table.py index 4b07880925..2f42b57137 100644 --- a/tests/serializers/models/multi_table.py +++ b/tests/serializers/models/multi_table.py @@ -8,7 +8,7 @@ class ParentManager(models.Manager): class Parent(models.Model): parent_data = models.CharField(max_length=30, unique=True) - parent_m2m = models.ManyToManyField('self') + parent_m2m = models.ManyToManyField("self") objects = ParentManager() diff --git a/tests/serializers/models/natural.py b/tests/serializers/models/natural.py index d062d7a45b..1e439b34eb 100644 --- a/tests/serializers/models/natural.py +++ b/tests/serializers/models/natural.py @@ -25,8 +25,12 @@ class FKDataNaturalKey(models.Model): class NaturalKeyThing(models.Model): key = models.CharField(max_length=100, unique=True) - other_thing = models.ForeignKey('NaturalKeyThing', on_delete=models.CASCADE, null=True) - other_things = models.ManyToManyField('NaturalKeyThing', related_name='thing_m2m_set') + other_thing = models.ForeignKey( + "NaturalKeyThing", on_delete=models.CASCADE, null=True + ) + other_things = models.ManyToManyField( + "NaturalKeyThing", related_name="thing_m2m_set" + ) class Manager(models.Manager): def get_by_natural_key(self, key): @@ -61,9 +65,11 @@ class FKAsPKNoNaturalKeyManager(models.Manager): class FKAsPKNoNaturalKey(models.Model): - pk_fk = models.ForeignKey(NaturalKeyAnchor, on_delete=models.CASCADE, primary_key=True) + pk_fk = models.ForeignKey( + NaturalKeyAnchor, on_delete=models.CASCADE, primary_key=True + ) objects = FKAsPKNoNaturalKeyManager() def natural_key(self): - raise NotImplementedError('This method was not expected to be called.') + raise NotImplementedError("This method was not expected to be called.") |
