mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-03 07:14:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refs #23919 -- Replaced super(ClassName, self) with super().

Browse source
This commit is contained in:
chillaranand 2017-01-21 18:43:44 +05:30 • committed by Tim Graham
parent dc165ec8e5
commit d6eaf7c018
339 changed files with 1221 additions and 1296 deletions
Download patch file Download diff file Expand all files Collapse all files

48
tests/admin_views/admin.py
View file

@ -107,11 +107,7 @@ class ArticleAdmin(admin.ModelAdmin):
)
def changelist_view(self, request):
return super(ArticleAdmin, self).changelist_view(
request, extra_context={
'extra_var': 'Hello!'
}
)
return super().changelist_view(request, extra_context={'extra_var': 'Hello!'})
def modeladmin_year(self, obj):
return obj.date.year
@ -125,7 +121,7 @@ class ArticleAdmin(admin.ModelAdmin):
'from@example.com',
['to@example.com']
).send()
return super(ArticleAdmin, self).delete_model(request, obj)
return super().delete_model(request, obj)
def save_model(self, request, obj, form, change=True):
EmailMessage(
@ -134,7 +130,7 @@ class ArticleAdmin(admin.ModelAdmin):
'from@example.com',
['to@example.com']
).send()
return super(ArticleAdmin, self).save_model(request, obj, form, change)
return super().save_model(request, obj, form, change)
class ArticleAdmin2(admin.ModelAdmin):
@ -162,11 +158,7 @@ class CustomArticleAdmin(admin.ModelAdmin):
popup_response_template = 'custom_admin/popup_response.html'
def changelist_view(self, request):
return super(CustomArticleAdmin, self).changelist_view(
request, extra_context={
'extra_var': 'Hello!'
}
)
return super().changelist_view(request, extra_context={'extra_var': 'Hello!'})
class ThingAdmin(admin.ModelAdmin):
@ -207,12 +199,12 @@ class PersonAdmin(admin.ModelAdmin):
save_as = True
def get_changelist_formset(self, request, **kwargs):
return super(PersonAdmin, self).get_changelist_formset(request, formset=BasePersonModelFormSet, **kwargs)
return super().get_changelist_formset(request, formset=BasePersonModelFormSet, **kwargs)
def get_queryset(self, request):
# Order by a field that isn't in list display, to be able to test
# whether ordering is preserved.
return super(PersonAdmin, self).get_queryset(request).order_by('age')
return super().get_queryset(request).order_by('age')
class FooAccountAdmin(admin.StackedInline):
@ -312,7 +304,7 @@ class ParentAdmin(admin.ModelAdmin):
list_editable = ('name',)
def save_related(self, request, form, formsets, change):
super(ParentAdmin, self).save_related(request, form, formsets, change)
super().save_related(request, form, formsets, change)
first_name, last_name = form.instance.name.split()
for child in form.instance.child_set.all():
if len(child.name.split()) < 2:
@ -322,7 +314,7 @@ class ParentAdmin(admin.ModelAdmin):
class EmptyModelAdmin(admin.ModelAdmin):
def get_queryset(self, request):
return super(EmptyModelAdmin, self).get_queryset(request).filter(pk__gt=1)
return super().get_queryset(request).filter(pk__gt=1)
class OldSubscriberAdmin(admin.ModelAdmin):
@ -521,7 +513,7 @@ class CoverLetterAdmin(admin.ModelAdmin):
"""
def get_queryset(self, request):
return super(CoverLetterAdmin, self).get_queryset(request).defer('date_written')
return super().get_queryset(request).defer('date_written')
class PaperAdmin(admin.ModelAdmin):
@ -533,7 +525,7 @@ class PaperAdmin(admin.ModelAdmin):
"""
def get_queryset(self, request):
return super(PaperAdmin, self).get_queryset(request).only('title')
return super().get_queryset(request).only('title')
class ShortMessageAdmin(admin.ModelAdmin):
@ -545,7 +537,7 @@ class ShortMessageAdmin(admin.ModelAdmin):
"""
def get_queryset(self, request):
return super(ShortMessageAdmin, self).get_queryset(request).defer('timestamp')
return super().get_queryset(request).defer('timestamp')
class TelegramAdmin(admin.ModelAdmin):
@ -557,7 +549,7 @@ class TelegramAdmin(admin.ModelAdmin):
"""
def get_queryset(self, request):
return super(TelegramAdmin, self).get_queryset(request).only('title')
return super().get_queryset(request).only('title')
class StoryForm(forms.ModelForm):
@ -594,9 +586,7 @@ class PluggableSearchPersonAdmin(admin.ModelAdmin):
search_fields = ('name',)
def get_search_results(self, request, queryset, search_term):
queryset, use_distinct = super(PluggableSearchPersonAdmin, self).get_search_results(
request, queryset, search_term
)
queryset, use_distinct = super().get_search_results(request, queryset, search_term)
try:
search_term_as_int = int(search_term)
except ValueError:
@ -713,13 +703,13 @@ class UnorderedObjectAdmin(admin.ModelAdmin):
class UndeletableObjectAdmin(admin.ModelAdmin):
def change_view(self, *args, **kwargs):
kwargs['extra_context'] = {'show_delete': False}
return super(UndeletableObjectAdmin, self).change_view(*args, **kwargs)
return super().change_view(*args, **kwargs)
class UnchangeableObjectAdmin(admin.ModelAdmin):
def get_urls(self):
# Disable change_view, but leave other urls untouched
urlpatterns = super(UnchangeableObjectAdmin, self).get_urls()
urlpatterns = super().get_urls()
return [p for p in urlpatterns if p.name and not p.name.endswith("_change")]
@ -775,7 +765,7 @@ class DependentChildAdminForm(forms.ModelForm):
if parent.family_name and parent.family_name != self.cleaned_data.get('family_name'):
raise ValidationError("Children must share a family name with their parents " +
"in this contrived test case")
return super(DependentChildAdminForm, self).clean()
return super().clean()
class DependentChildInline(admin.TabularInline):
@ -883,18 +873,18 @@ class GetFormsetsArgumentCheckingAdmin(admin.ModelAdmin):
def add_view(self, request, *args, **kwargs):
request.is_add_view = True
return super(GetFormsetsArgumentCheckingAdmin, self).add_view(request, *args, **kwargs)
return super().add_view(request, *args, **kwargs)
def change_view(self, request, *args, **kwargs):
request.is_add_view = False
return super(GetFormsetsArgumentCheckingAdmin, self).change_view(request, *args, **kwargs)
return super().change_view(request, *args, **kwargs)
def get_formsets_with_inlines(self, request, obj=None):
if request.is_add_view and obj is not None:
raise Exception("'obj' passed to get_formsets_with_inlines wasn't None during add_view")
if not request.is_add_view and obj is None:
raise Exception("'obj' passed to get_formsets_with_inlines was None during change_view")
return super(GetFormsetsArgumentCheckingAdmin, self).get_formsets_with_inlines(request, obj)
return super().get_formsets_with_inlines(request, obj)
site = admin.AdminSite(name="admin")