1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

Refs #33476 -- Reformatted code with Black.

This commit is contained in:
django-bot
2022-02-03 20:24:19 +01:00
committed by Mariusz Felisiak
parent f68fa8b45d
commit 9c19aff7c7
1992 changed files with 139577 additions and 96284 deletions

View File

@@ -3,17 +3,17 @@ from django.db import models
class Article(models.Model):
CHOICES = (
(1, 'first'),
(2, 'second'),
(1, "first"),
(2, "second"),
)
headline = models.CharField(max_length=100, default='Default headline')
headline = models.CharField(max_length=100, default="Default headline")
pub_date = models.DateTimeField()
status = models.IntegerField(blank=True, null=True, choices=CHOICES)
misc_data = models.CharField(max_length=100, blank=True)
article_text = models.TextField()
class Meta:
ordering = ('pub_date', 'headline')
ordering = ("pub_date", "headline")
# A utf-8 verbose name (Ångström's Articles) to test they are valid.
verbose_name = "\xc3\x85ngstr\xc3\xb6m's Articles"
@@ -55,8 +55,8 @@ class Model1(models.Model):
class Model2(models.Model):
model1 = models.ForeignKey(Model1, models.CASCADE, unique=True, to_field='pkey')
model1 = models.ForeignKey(Model1, models.CASCADE, unique=True, to_field="pkey")
class Model3(models.Model):
model2 = models.ForeignKey(Model2, models.CASCADE, unique=True, to_field='model1')
model2 = models.ForeignKey(Model2, models.CASCADE, unique=True, to_field="model1")

View File

@@ -11,6 +11,7 @@ class ModelPickleTests(SimpleTestCase):
#21430 -- Verifies a warning is raised for models that are
unpickled without a Django version
"""
class MissingDjangoVersion(models.Model):
title = models.CharField(max_length=10)
@@ -30,13 +31,14 @@ class ModelPickleTests(SimpleTestCase):
#21430 -- Verifies a warning is raised for models that are
unpickled with a different Django version than the current
"""
class DifferentDjangoVersion(models.Model):
title = models.CharField(max_length=10)
def __reduce__(self):
reduce_list = super().__reduce__()
data = reduce_list[-1]
data[DJANGO_VERSION_PICKLE_KEY] = '1.0'
data[DJANGO_VERSION_PICKLE_KEY] = "1.0"
return reduce_list
p = DifferentDjangoVersion(title="FooBar")
@@ -51,10 +53,11 @@ class ModelPickleTests(SimpleTestCase):
"""
A model may override __getstate__() to choose the attributes to pickle.
"""
class PickledModel(models.Model):
def __getstate__(self):
state = super().__getstate__().copy()
del state['dont_pickle']
del state["dont_pickle"]
return state
m = PickledModel()
@@ -62,4 +65,4 @@ class ModelPickleTests(SimpleTestCase):
dumped = pickle.dumps(m)
self.assertEqual(m.dont_pickle, 1)
reloaded = pickle.loads(dumped)
self.assertFalse(hasattr(reloaded, 'dont_pickle'))
self.assertFalse(hasattr(reloaded, "dont_pickle"))

View File

@@ -3,9 +3,10 @@ from django.test import SimpleTestCase
class ModelStateTests(SimpleTestCase):
def test_fields_cache_descriptor(self):
self.assertIsInstance(ModelState.fields_cache, ModelStateCacheDescriptor)
def test_related_managers_descriptor(self):
self.assertIsInstance(ModelState.related_managers_cache, ModelStateCacheDescriptor)
self.assertIsInstance(
ModelState.related_managers_cache, ModelStateCacheDescriptor
)

View File

@@ -10,7 +10,14 @@ from django.test.utils import isolate_apps
from django.utils.timezone import get_fixed_timezone
from .models import (
Article, Department, Event, Model1, Model2, Model3, NonAutoPK, Party,
Article,
Department,
Event,
Model1,
Model2,
Model3,
NonAutoPK,
Party,
Worker,
)
@@ -56,7 +63,7 @@ class ModelTests(TestCase):
# Empty strings should be returned as string
a = Article.objects.get(pk=a.pk)
self.assertEqual(a.misc_data, '')
self.assertEqual(a.misc_data, "")
def test_long_textfield(self):
# TextFields can hold more than 4000 characters (this was broken in
@@ -64,7 +71,7 @@ class ModelTests(TestCase):
a = Article.objects.create(
headline="Really, really big",
pub_date=datetime.datetime.now(),
article_text="ABCDE" * 1000
article_text="ABCDE" * 1000,
)
a = Article.objects.get(pk=a.pk)
self.assertEqual(len(a.article_text), 5000)
@@ -75,7 +82,7 @@ class ModelTests(TestCase):
a = Article.objects.create(
headline="Really, really big",
pub_date=datetime.datetime.now(),
article_text='\u05d0\u05d1\u05d2' * 1000
article_text="\u05d0\u05d1\u05d2" * 1000,
)
a = Article.objects.get(pk=a.pk)
self.assertEqual(len(a.article_text), 3000)
@@ -86,65 +93,69 @@ class ModelTests(TestCase):
Party.objects.create(when=datetime.datetime(1998, 12, 31))
Party.objects.create(when=datetime.datetime(1999, 1, 1))
Party.objects.create(when=datetime.datetime(1, 3, 3))
self.assertQuerysetEqual(Party.objects.filter(when__month=2), [])
self.assertQuerysetEqual(
Party.objects.filter(when__month=2), []
Party.objects.filter(when__month=1),
[datetime.date(1999, 1, 1)],
attrgetter("when"),
)
self.assertQuerysetEqual(
Party.objects.filter(when__month=1), [
datetime.date(1999, 1, 1)
],
attrgetter("when")
)
self.assertQuerysetEqual(
Party.objects.filter(when__month=12), [
Party.objects.filter(when__month=12),
[
datetime.date(1999, 12, 31),
datetime.date(1998, 12, 31),
],
attrgetter("when"),
ordered=False
ordered=False,
)
self.assertQuerysetEqual(
Party.objects.filter(when__year=1998), [
Party.objects.filter(when__year=1998),
[
datetime.date(1998, 12, 31),
],
attrgetter("when")
attrgetter("when"),
)
# Regression test for #8510
self.assertQuerysetEqual(
Party.objects.filter(when__day="31"), [
Party.objects.filter(when__day="31"),
[
datetime.date(1999, 12, 31),
datetime.date(1998, 12, 31),
],
attrgetter("when"),
ordered=False
ordered=False,
)
self.assertQuerysetEqual(
Party.objects.filter(when__month="12"), [
Party.objects.filter(when__month="12"),
[
datetime.date(1999, 12, 31),
datetime.date(1998, 12, 31),
],
attrgetter("when"),
ordered=False
ordered=False,
)
self.assertQuerysetEqual(
Party.objects.filter(when__year="1998"), [
Party.objects.filter(when__year="1998"),
[
datetime.date(1998, 12, 31),
],
attrgetter("when")
attrgetter("when"),
)
# Regression test for #18969
self.assertQuerysetEqual(
Party.objects.filter(when__year=1), [
Party.objects.filter(when__year=1),
[
datetime.date(1, 3, 3),
],
attrgetter("when")
attrgetter("when"),
)
self.assertQuerysetEqual(
Party.objects.filter(when__year='1'), [
Party.objects.filter(when__year="1"),
[
datetime.date(1, 3, 3),
],
attrgetter("when")
attrgetter("when"),
)
def test_date_filter_null(self):
@@ -155,10 +166,9 @@ class ModelTests(TestCase):
p = Party.objects.filter(when__month=1)[0]
self.assertEqual(p.when, datetime.date(1999, 1, 1))
self.assertQuerysetEqual(
Party.objects.filter(pk=p.pk).dates("when", "month"), [
1
],
attrgetter("month")
Party.objects.filter(pk=p.pk).dates("when", "month"),
[1],
attrgetter("month"),
)
def test_get_next_prev_by_field(self):
@@ -176,7 +186,7 @@ class ModelTests(TestCase):
)
def test_get_next_prev_by_field_unsaved(self):
msg = 'get_next/get_previous cannot be used on unsaved objects.'
msg = "get_next/get_previous cannot be used on unsaved objects."
with self.assertRaisesMessage(ValueError, msg):
Event().get_next_by_when()
with self.assertRaisesMessage(ValueError, msg):
@@ -202,8 +212,7 @@ class ModelTests(TestCase):
obj.pub_date = dt2
obj.save()
self.assertEqual(
Article.objects.filter(headline="A headline").update(pub_date=dt1),
1
Article.objects.filter(headline="A headline").update(pub_date=dt1), 1
)
def test_chained_fks(self):
@@ -219,16 +228,17 @@ class ModelTests(TestCase):
m3 = Model3.objects.get(model2=1000)
m3.model2
@isolate_apps('model_regress')
@isolate_apps("model_regress")
def test_metaclass_can_access_attribute_dict(self):
"""
Model metaclasses have access to the class attribute dict in
__init__() (#30254).
"""
class HorseBase(models.base.ModelBase):
def __init__(cls, name, bases, attrs):
super().__init__(name, bases, attrs)
cls.horns = (1 if 'magic' in attrs else 0)
cls.horns = 1 if "magic" in attrs else 0
class Horse(models.Model, metaclass=HorseBase):
name = models.CharField(max_length=255)
@@ -254,16 +264,16 @@ class EvaluateMethodTest(TestCase):
"""
You can filter by objects that have an 'evaluate' attr
"""
dept = Department.objects.create(pk=1, name='abc')
dept.evaluate = 'abc'
dept = Department.objects.create(pk=1, name="abc")
dept.evaluate = "abc"
Worker.objects.filter(department=dept)
class ModelFieldsCacheTest(TestCase):
def test_fields_cache_reset_on_copy(self):
department1 = Department.objects.create(id=1, name='department1')
department2 = Department.objects.create(id=2, name='department2')
worker1 = Worker.objects.create(name='worker', department=department1)
department1 = Department.objects.create(id=1, name="department1")
department2 = Department.objects.create(id=2, name="department2")
worker1 = Worker.objects.create(name="worker", department=department1)
worker2 = copy.copy(worker1)
self.assertEqual(worker2.department, department1)