mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Refs #33476 -- Reformatted code with Black.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

92
tests/admin_changelist/admin.py
View File

@@ -12,12 +12,14 @@ site.register(User, UserAdmin)
class CustomPaginator(Paginator):
def __init__(self, queryset, page_size, orphans=0, allow_empty_first_page=True):
super().__init__(queryset, 5, orphans=2, allow_empty_first_page=allow_empty_first_page)
super().__init__(
queryset, 5, orphans=2, allow_empty_first_page=allow_empty_first_page
)
class EventAdmin(admin.ModelAdmin):
date_hierarchy = 'date'
list_display = ['event_date_func']
date_hierarchy = "date"
list_display = ["event_date_func"]
@admin.display
def event_date_func(self, event):
@@ -31,21 +33,21 @@ site.register(Event, EventAdmin)
class ParentAdmin(admin.ModelAdmin):
list_filter = ['child__name']
search_fields = ['child__name']
list_select_related = ['child']
list_filter = ["child__name"]
search_fields = ["child__name"]
list_select_related = ["child"]
class ParentAdminTwoSearchFields(admin.ModelAdmin):
list_filter = ['child__name']
search_fields = ['child__name', 'child__age']
list_select_related = ['child']
list_filter = ["child__name"]
search_fields = ["child__name", "child__age"]
list_select_related = ["child"]
class ChildAdmin(admin.ModelAdmin):
list_display = ['name', 'parent']
list_display = ["name", "parent"]
list_per_page = 10
list_filter = ['parent', 'age']
list_filter = ["parent", "age"]
def get_queryset(self, request):
return super().get_queryset(request).select_related("parent")
@@ -56,32 +58,32 @@ class CustomPaginationAdmin(ChildAdmin):
class FilteredChildAdmin(admin.ModelAdmin):
list_display = ['name', 'parent']
list_display = ["name", "parent"]
list_per_page = 10
def get_queryset(self, request):
return super().get_queryset(request).filter(name__contains='filtered')
return super().get_queryset(request).filter(name__contains="filtered")
class BandAdmin(admin.ModelAdmin):
list_filter = ['genres']
list_filter = ["genres"]
class NrOfMembersFilter(admin.SimpleListFilter):
title = 'number of members'
parameter_name = 'nr_of_members_partition'
title = "number of members"
parameter_name = "nr_of_members_partition"
def lookups(self, request, model_admin):
return [
('5', '0 - 5'),
('more', 'more than 5'),
("5", "0 - 5"),
("more", "more than 5"),
]
def queryset(self, request, queryset):
value = self.value()
if value == '5':
if value == "5":
return queryset.filter(nr_of_members__lte=5)
if value == 'more':
if value == "more":
return queryset.filter(nr_of_members__gt=5)
@@ -93,44 +95,44 @@ site.register(Band, BandCallableFilterAdmin)
class GroupAdmin(admin.ModelAdmin):
list_filter = ['members']
list_filter = ["members"]
class ConcertAdmin(admin.ModelAdmin):
list_filter = ['group__members']
search_fields = ['group__members__name']
list_filter = ["group__members"]
search_fields = ["group__members__name"]
class QuartetAdmin(admin.ModelAdmin):
list_filter = ['members']
list_filter = ["members"]
class ChordsBandAdmin(admin.ModelAdmin):
list_filter = ['members']
list_filter = ["members"]
class InvitationAdmin(admin.ModelAdmin):
list_display = ('band', 'player')
list_select_related = ('player',)
list_display = ("band", "player")
list_select_related = ("player",)
class DynamicListDisplayChildAdmin(admin.ModelAdmin):
list_display = ('parent', 'name', 'age')
list_display = ("parent", "name", "age")
def get_list_display(self, request):
my_list_display = super().get_list_display(request)
if request.user.username == 'noparents':
if request.user.username == "noparents":
my_list_display = list(my_list_display)
my_list_display.remove('parent')
my_list_display.remove("parent")
return my_list_display
class DynamicListDisplayLinksChildAdmin(admin.ModelAdmin):
list_display = ('parent', 'name', 'age')
list_display_links = ['parent', 'name']
list_display = ("parent", "name", "age")
list_display_links = ["parent", "name"]
def get_list_display_links(self, request, list_display):
return ['age']
return ["age"]
site.register(Child, DynamicListDisplayChildAdmin)
@@ -138,8 +140,8 @@ site.register(Child, DynamicListDisplayChildAdmin)
class NoListDisplayLinksParentAdmin(admin.ModelAdmin):
list_display_links = None
list_display = ['name']
list_editable = ['name']
list_display = ["name"]
list_editable = ["name"]
actions_on_bottom = True
@@ -148,8 +150,8 @@ site.register(Parent, NoListDisplayLinksParentAdmin)
class SwallowAdmin(admin.ModelAdmin):
actions = None # prevent ['action_checkbox'] + list(list_display)
list_display = ('origin', 'load', 'speed', 'swallowonetoone')
list_editable = ['load', 'speed']
list_display = ("origin", "load", "speed", "swallowonetoone")
list_editable = ["load", "speed"]
list_per_page = 3
@@ -157,29 +159,29 @@ site.register(Swallow, SwallowAdmin)
class DynamicListFilterChildAdmin(admin.ModelAdmin):
list_filter = ('parent', 'name', 'age')
list_filter = ("parent", "name", "age")
def get_list_filter(self, request):
my_list_filter = super().get_list_filter(request)
if request.user.username == 'noparents':
if request.user.username == "noparents":
my_list_filter = list(my_list_filter)
my_list_filter.remove('parent')
my_list_filter.remove("parent")
return my_list_filter
class DynamicSearchFieldsChildAdmin(admin.ModelAdmin):
search_fields = ('name',)
search_fields = ("name",)
def get_search_fields(self, request):
search_fields = super().get_search_fields(request)
search_fields += ('age',)
search_fields += ("age",)
return search_fields
class EmptyValueChildAdmin(admin.ModelAdmin):
empty_value_display = '-empty-'
list_display = ('name', 'age_display', 'age')
empty_value_display = "-empty-"
list_display = ("name", "age_display", "age")
@admin.display(empty_value='†')
@admin.display(empty_value="†")
def age_display(self, obj):
return obj.age

12
tests/admin_changelist/models.py
View File

@@ -38,7 +38,7 @@ class Musician(models.Model):
class Group(models.Model):
name = models.CharField(max_length=30)
members = models.ManyToManyField(Musician, through='Membership')
members = models.ManyToManyField(Musician, through="Membership")
def __str__(self):
return self.name
@@ -65,7 +65,7 @@ class ChordsMusician(Musician):
class ChordsBand(models.Model):
name = models.CharField(max_length=30)
members = models.ManyToManyField(ChordsMusician, through='Invitation')
members = models.ManyToManyField(ChordsMusician, through="Invitation")
class Invitation(models.Model):
@@ -81,7 +81,7 @@ class Swallow(models.Model):
speed = models.FloatField()
class Meta:
ordering = ('speed', 'load')
ordering = ("speed", "load")
class SwallowOneToOne(models.Model):
@@ -93,12 +93,13 @@ class UnorderedObject(models.Model):
Model without any defined `Meta.ordering`.
Refs #17198.
"""
bool = models.BooleanField(default=True)
class OrderedObjectManager(models.Manager):
def get_queryset(self):
return super().get_queryset().order_by('number')
return super().get_queryset().order_by("number")
class OrderedObject(models.Model):
@@ -106,9 +107,10 @@ class OrderedObject(models.Model):
Model with Manager that defines a default order.
Refs #17198.
"""
name = models.CharField(max_length=255)
bool = models.BooleanField(default=True)
number = models.IntegerField(default=0, db_column='number_val')
number = models.IntegerField(default=0, db_column="number_val")
objects = OrderedObjectManager()

71
tests/admin_changelist/test_date_hierarchy.py
View File

@@ -5,7 +5,8 @@ from django.contrib.auth.models import User
from django.test import RequestFactory, TestCase
from django.utils.timezone import make_aware
from .admin import EventAdmin, site as custom_site
from .admin import EventAdmin
from .admin import site as custom_site
from .models import Event
@@ -14,34 +15,48 @@ class DateHierarchyTests(TestCase):
@classmethod
def setUpTestData(cls):
cls.superuser = User.objects.create_superuser(username='super', email='a@b.com', password='xxx')
cls.superuser = User.objects.create_superuser(
username="super", email="a@b.com", password="xxx"
)
def assertDateParams(self, query, expected_from_date, expected_to_date):
query = {'date__%s' % field: val for field, val in query.items()}
request = self.factory.get('/', query)
query = {"date__%s" % field: val for field, val in query.items()}
request = self.factory.get("/", query)
request.user = self.superuser
changelist = EventAdmin(Event, custom_site).get_changelist_instance(request)
_, _, lookup_params, *_ = changelist.get_filters(request)
self.assertEqual(lookup_params['date__gte'], expected_from_date)
self.assertEqual(lookup_params['date__lt'], expected_to_date)
self.assertEqual(lookup_params["date__gte"], expected_from_date)
self.assertEqual(lookup_params["date__lt"], expected_to_date)
def test_bounded_params(self):
tests = (
({'year': 2017}, datetime(2017, 1, 1), datetime(2018, 1, 1)),
({'year': 2017, 'month': 2}, datetime(2017, 2, 1), datetime(2017, 3, 1)),
({'year': 2017, 'month': 12}, datetime(2017, 12, 1), datetime(2018, 1, 1)),
({'year': 2017, 'month': 12, 'day': 15}, datetime(2017, 12, 15), datetime(2017, 12, 16)),
({'year': 2017, 'month': 12, 'day': 31}, datetime(2017, 12, 31), datetime(2018, 1, 1)),
({'year': 2017, 'month': 2, 'day': 28}, datetime(2017, 2, 28), datetime(2017, 3, 1)),
({"year": 2017}, datetime(2017, 1, 1), datetime(2018, 1, 1)),
({"year": 2017, "month": 2}, datetime(2017, 2, 1), datetime(2017, 3, 1)),
({"year": 2017, "month": 12}, datetime(2017, 12, 1), datetime(2018, 1, 1)),
(
{"year": 2017, "month": 12, "day": 15},
datetime(2017, 12, 15),
datetime(2017, 12, 16),
),
(
{"year": 2017, "month": 12, "day": 31},
datetime(2017, 12, 31),
datetime(2018, 1, 1),
),
(
{"year": 2017, "month": 2, "day": 28},
datetime(2017, 2, 28),
datetime(2017, 3, 1),
),
)
for query, expected_from_date, expected_to_date in tests:
with self.subTest(query=query):
self.assertDateParams(query, expected_from_date, expected_to_date)
def test_bounded_params_with_time_zone(self):
with self.settings(USE_TZ=True, TIME_ZONE='Asia/Jerusalem'):
with self.settings(USE_TZ=True, TIME_ZONE="Asia/Jerusalem"):
self.assertDateParams(
{'year': 2017, 'month': 2, 'day': 28},
{"year": 2017, "month": 2, "day": 28},
make_aware(datetime(2017, 2, 28)),
make_aware(datetime(2017, 3, 1)),
)
@@ -49,31 +64,33 @@ class DateHierarchyTests(TestCase):
def test_bounded_params_with_dst_time_zone(self):
tests = [
# Northern hemisphere.
('Asia/Jerusalem', 3),
('Asia/Jerusalem', 10),
("Asia/Jerusalem", 3),
("Asia/Jerusalem", 10),
# Southern hemisphere.
('Pacific/Chatham', 4),
('Pacific/Chatham', 9),
("Pacific/Chatham", 4),
("Pacific/Chatham", 9),
]
for time_zone, month in tests:
with self.subTest(time_zone=time_zone, month=month):
with self.settings(USE_TZ=True, TIME_ZONE=time_zone):
self.assertDateParams(
{'year': 2019, 'month': month},
{"year": 2019, "month": month},
make_aware(datetime(2019, month, 1)),
make_aware(datetime(2019, month + 1, 1)),
)
def test_invalid_params(self):
tests = (
{'year': 'x'},
{'year': 2017, 'month': 'x'},
{'year': 2017, 'month': 12, 'day': 'x'},
{'year': 2017, 'month': 13},
{'year': 2017, 'month': 12, 'day': 32},
{'year': 2017, 'month': 0},
{'year': 2017, 'month': 12, 'day': 0},
{"year": "x"},
{"year": 2017, "month": "x"},
{"year": 2017, "month": 12, "day": "x"},
{"year": 2017, "month": 13},
{"year": 2017, "month": 12, "day": 32},
{"year": 2017, "month": 0},
{"year": 2017, "month": 12, "day": 0},
)
for invalid_query in tests:
with self.subTest(query=invalid_query), self.assertRaises(IncorrectLookupParameters):
with self.subTest(query=invalid_query), self.assertRaises(
IncorrectLookupParameters
):
self.assertDateParams(invalid_query, None, None)

1200
tests/admin_changelist/tests.py
View File

File diff suppressed because it is too large Load Diff

2
tests/admin_changelist/urls.py
View File

@@ -3,5 +3,5 @@ from django.urls import path
from . import admin
urlpatterns = [
path('admin/', admin.site.urls),
path("admin/", admin.site.urls),
]