Skip to content

Commit

Permalink
Super simplified.
Browse files Browse the repository at this point in the history
  • Loading branch information
idlesign committed Jun 9, 2020
1 parent c509175 commit 5de47da
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions sitetree/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def formfield_for_manytomany(self, db_field, request=None, **kwargs):
qs = kwargs.get('queryset', objects)
kwargs['queryset'] = qs.select_related('content_type')

return super(TreeItemAdmin, self).formfield_for_manytomany(db_field, request=request, **kwargs)
return super().formfield_for_manytomany(db_field, request=request, **kwargs)

def _redirect(self, request: HttpRequest, response: HttpResponse) -> HttpResponse:
"""Generic redirect for item editor."""
Expand All @@ -156,7 +156,7 @@ def response_add(self, request, obj, post_url_continue=None, **kwargs):
if post_url_continue is None:
post_url_continue = '../item_%s/' % obj.pk

return self._redirect(request, super(TreeItemAdmin, self).response_add(request, obj, post_url_continue))
return self._redirect(request, super().response_add(request, obj, post_url_continue))

def response_change(self, request, obj, **kwargs):
"""Redirects to the appropriate items' 'add' page on item change.
Expand All @@ -165,7 +165,7 @@ def response_change(self, request, obj, **kwargs):
should make some changes to redirection process.
"""
return self._redirect(request, super(TreeItemAdmin, self).response_change(request, obj))
return self._redirect(request, super().response_change(request, obj))

def get_form(self, request, obj=None, **kwargs):
"""Returns modified form for TreeItem model.
Expand All @@ -175,7 +175,7 @@ def get_form(self, request, obj=None, **kwargs):
if obj is not None and obj.parent is not None:
self.previous_parent = obj.parent

form = super(TreeItemAdmin, self).get_form(request, obj, **kwargs)
form = super().get_form(request, obj, **kwargs)
form.base_fields['parent'].choices_init(self.tree)

# Try to resolve all currently registered url names including those in namespaces.
Expand Down Expand Up @@ -316,16 +316,16 @@ def __init__(self, *args, **kwargs):
if SMUGGLER_INSTALLED:
self.change_list_template = 'admin/sitetree/tree/change_list_.html'

super(TreeAdmin, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
self.tree_admin = _ITEM_ADMIN()(MODEL_TREE_ITEM_CLASS, admin.site)

def render_change_form(self, request, context, **kwargs):
context['icon_ext'] = '.svg'
return super(TreeAdmin, self).render_change_form(request, context, **kwargs)
return super().render_change_form(request, context, **kwargs)

def get_urls(self):
"""Manages not only TreeAdmin URLs but also TreeItemAdmin URLs."""
urls = super(TreeAdmin, self).get_urls()
urls = super().get_urls()

prefix_change = 'change/'

Expand Down
2 changes: 1 addition & 1 deletion sitetree/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def __init__(
help_text=None,
*args, **kwargs
):
super(TreeItemChoiceField, self).__init__(
super().__init__(
required=required, widget=widget, label=label, initial=initial,
help_text=help_text, *args, **kwargs)

Expand Down
2 changes: 1 addition & 1 deletion sitetree/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class TreeItemForm(forms.Form):
def __init__(self, *args, **kwargs):
tree = kwargs.pop('tree', None)
tree_item = kwargs.pop('tree_item', None)
super(TreeItemForm, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)

# autocomplete off - deals with Firefox form caching
# https://bugzilla.mozilla.org/show_bug.cgi?id=46845
Expand Down
2 changes: 1 addition & 1 deletion sitetree/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def save(self, force_insert=False, force_update=False, **kwargs):
if id_ and self.sort_order == 0:
self.sort_order = id_

super(TreeItemBase, self).save(force_insert, force_update, **kwargs)
super().save(force_insert, force_update, **kwargs)

# Set item's sort order to its primary key if not already set.
if self.sort_order == 0:
Expand Down

0 comments on commit 5de47da

Please sign in to comment.