mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-04 02:48:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed hanging indentation in various code.

Browse source
This commit is contained in:
Mariusz Felisiak 2018-03-16 10:54:34 +01:00 • committed by GitHub
parent aeb8c38178
commit 362813d628
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 266 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/expressions/models.py
View file

@ -22,12 +22,14 @@ class Company(models.Model):
ceo = models.ForeignKey(
Employee,
models.CASCADE,
related_name='company_ceo_set')
related_name='company_ceo_set',
)
point_of_contact = models.ForeignKey(
Employee,
models.SET_NULL,
related_name='company_point_of_contact_set',
null=True)
null=True,
)
def __str__(self):
return self.name

21
tests/expressions/tests.py
View file

@ -373,7 +373,8 @@ class BasicExpressionsTests(TestCase):
# other lookups could not reuse.
qs = Employee.objects.filter(
company_ceo_set__num_chairs=F('company_ceo_set__num_employees'),
company_ceo_set__num_chairs__gte=1)
company_ceo_set__num_chairs__gte=1,
)
self.assertEqual(str(qs.query).count('JOIN'), 1)
def test_ticket_18375_kwarg_ordering_2(self):
@ -793,17 +794,20 @@ class ExpressionsTests(TestCase):
self.assertQuerysetEqual(
Employee.objects.filter(firstname__contains=F('lastname')),
["<Employee: %Joh\\nny %Joh\\n>", "<Employee: Jean-Claude Claude>", "<Employee: Johnny John>"],
ordered=False)
ordered=False,
)
self.assertQuerysetEqual(
Employee.objects.filter(firstname__startswith=F('lastname')),
["<Employee: %Joh\\nny %Joh\\n>", "<Employee: Johnny John>"],
ordered=False)
ordered=False,
)
self.assertQuerysetEqual(
Employee.objects.filter(firstname__endswith=F('lastname')),
["<Employee: Jean-Claude Claude>"],
ordered=False)
ordered=False,
)
def test_insensitive_patterns_escape(self):
r"""
@ -825,17 +829,20 @@ class ExpressionsTests(TestCase):
self.assertQuerysetEqual(
Employee.objects.filter(firstname__icontains=F('lastname')),
["<Employee: %Joh\\nny %joh\\n>", "<Employee: Jean-Claude claude>", "<Employee: Johnny john>"],
ordered=False)
ordered=False,
)
self.assertQuerysetEqual(
Employee.objects.filter(firstname__istartswith=F('lastname')),
["<Employee: %Joh\\nny %joh\\n>", "<Employee: Johnny john>"],
ordered=False)
ordered=False,
)
self.assertQuerysetEqual(
Employee.objects.filter(firstname__iendswith=F('lastname')),
["<Employee: Jean-Claude claude>"],
ordered=False)
ordered=False,
)
class ExpressionsNumericTests(TestCase):