Skip to content

Commit 5b9acd1

Browse files
committed
isort and black with longer line length
1 parent 8a5b555 commit 5b9acd1

34 files changed

+189
-369
lines changed

example/example/urls.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
from django.urls import include, path
21
from django.contrib import admin
3-
from django.urls import reverse_lazy
2+
from django.urls import include, path, reverse_lazy
43
from django.views.generic import RedirectView
54

65
admin.autodiscover()
76

87
urlpatterns = [
9-
path('admin/', admin.site.urls),
10-
path('', RedirectView.as_view(url=reverse_lazy("admin:index"), permanent=False)),
8+
path("admin/", admin.site.urls),
9+
path("", RedirectView.as_view(url=reverse_lazy("admin:index"), permanent=False)),
1110
]

example/pexp/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from django.contrib import admin
2-
32
from pexp.models import *
3+
44
from polymorphic.admin import (
55
PolymorphicChildModelAdmin,
66
PolymorphicChildModelFilter,

example/pexp/management/commands/p2cmd.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
from django.core.management import BaseCommand
1111
from django.db import connection
12-
1312
from pexp.models import *
1413

1514
rnd = Random()

example/pexp/management/commands/pcmd.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
from django.core.management.base import NoArgsCommand
66
from django.db import connection
7-
87
from pexp.models import *
98

109

@@ -19,9 +18,7 @@ def handle_noargs(self, **options):
1918
Project.objects.all().delete()
2019
a = Project.objects.create(topic="John's gathering")
2120
b = ArtProject.objects.create(topic="Sculpting with Tim", artist="T. Turner")
22-
c = ResearchProject.objects.create(
23-
topic="Swallow Aerodynamics", supervisor="Dr. Winter"
24-
)
21+
c = ResearchProject.objects.create(topic="Swallow Aerodynamics", supervisor="Dr. Winter")
2522
print(Project.objects.all())
2623
print("")
2724

example/pexp/management/commands/polybench.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
from django.core.management import BaseCommand
1010
from django.db import connection
11-
1211
from pexp.models import *
1312

1413
num_objects = 1000

example/pexp/management/commands/polymorphic_create_test_data.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"""
44

55
from django.core.management import BaseCommand
6-
76
from pexp.models import *
87

98

@@ -14,7 +13,5 @@ def handle_noargs(self, **options):
1413
Project.objects.all().delete()
1514
o = Project.objects.create(topic="John's gathering")
1615
o = ArtProject.objects.create(topic="Sculpting with Tim", artist="T. Turner")
17-
o = ResearchProject.objects.create(
18-
topic="Swallow Aerodynamics", supervisor="Dr. Winter"
19-
)
16+
o = ResearchProject.objects.create(topic="Swallow Aerodynamics", supervisor="Dr. Winter")
2017
print(Project.objects.all())

example/pexp/migrations/0001_initial.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,7 @@ class Migration(migrations.Migration):
263263
("field3", models.CharField(max_length=10)),
264264
(
265265
"field4",
266-
models.ManyToManyField(
267-
related_name="related_c", to="pexp.TestModelB"
268-
),
266+
models.ManyToManyField(related_name="related_c", to="pexp.TestModelB"),
269267
),
270268
],
271269
options={"abstract": False},

polymorphic/admin/childadmin.py

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin):
4747
show_in_index = False
4848

4949
def __init__(self, model, admin_site, *args, **kwargs):
50-
super().__init__(
51-
model, admin_site, *args, **kwargs
52-
)
50+
super().__init__(model, admin_site, *args, **kwargs)
5351

5452
if self.base_model is None:
5553
self.base_model = get_base_polymorphic_model(model)
@@ -94,8 +92,7 @@ def change_form_template(self):
9492
f"admin/{app_label}/{opts.object_name.lower()}/change_form.html",
9593
"admin/%s/change_form.html" % app_label,
9694
# Added:
97-
"admin/%s/%s/change_form.html"
98-
% (base_app_label, base_opts.object_name.lower()),
95+
"admin/%s/%s/change_form.html" % (base_app_label, base_opts.object_name.lower()),
9996
"admin/%s/change_form.html" % base_app_label,
10097
"admin/polymorphic/change_form.html",
10198
"admin/change_form.html",
@@ -111,8 +108,7 @@ def delete_confirmation_template(self):
111108
base_app_label = base_opts.app_label
112109

113110
return [
114-
"admin/%s/%s/delete_confirmation.html"
115-
% (app_label, opts.object_name.lower()),
111+
"admin/%s/%s/delete_confirmation.html" % (app_label, opts.object_name.lower()),
116112
"admin/%s/delete_confirmation.html" % app_label,
117113
# Added:
118114
"admin/%s/%s/delete_confirmation.html"
@@ -135,8 +131,7 @@ def object_history_template(self):
135131
f"admin/{app_label}/{opts.object_name.lower()}/object_history.html",
136132
"admin/%s/object_history.html" % app_label,
137133
# Added:
138-
"admin/%s/%s/object_history.html"
139-
% (base_app_label, base_opts.object_name.lower()),
134+
"admin/%s/%s/object_history.html" % (base_app_label, base_opts.object_name.lower()),
140135
"admin/%s/object_history.html" % base_app_label,
141136
"admin/polymorphic/object_history.html",
142137
"admin/object_history.html",
@@ -176,28 +171,22 @@ def response_post_save_add(self, request, obj):
176171
def response_post_save_change(self, request, obj):
177172
return self._get_parent_admin().response_post_save_change(request, obj)
178173

179-
def render_change_form(
180-
self, request, context, add=False, change=False, form_url="", obj=None
181-
):
174+
def render_change_form(self, request, context, add=False, change=False, form_url="", obj=None):
182175
context.update({"base_opts": self.base_model._meta})
183176
return super().render_change_form(
184177
request, context, add=add, change=change, form_url=form_url, obj=obj
185178
)
186179

187180
def delete_view(self, request, object_id, context=None):
188181
extra_context = {"base_opts": self.base_model._meta}
189-
return super().delete_view(
190-
request, object_id, extra_context
191-
)
182+
return super().delete_view(request, object_id, extra_context)
192183

193184
def history_view(self, request, object_id, extra_context=None):
194185
# Make sure the history view can also display polymorphic breadcrumbs
195186
context = {"base_opts": self.base_model._meta}
196187
if extra_context:
197188
context.update(extra_context)
198-
return super().history_view(
199-
request, object_id, extra_context=context
200-
)
189+
return super().history_view(request, object_id, extra_context=context)
201190

202191
# ---- Extra: improving the form/fieldset default display ----
203192

polymorphic/admin/filters.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ def queryset(self, request, queryset):
3232
if choice_value == value:
3333
return queryset.filter(polymorphic_ctype_id=choice_value)
3434
raise PermissionDenied(
35-
'Invalid ContentType "{}". It must be registered as child model.'.format(
36-
value
37-
)
35+
'Invalid ContentType "{}". It must be registered as child model.'.format(value)
3836
)
3937
return queryset

polymorphic/admin/generic.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
from .inlines import PolymorphicInlineModelAdmin
1212

1313

14-
class GenericPolymorphicInlineModelAdmin(
15-
PolymorphicInlineModelAdmin, GenericInlineModelAdmin
16-
):
14+
class GenericPolymorphicInlineModelAdmin(PolymorphicInlineModelAdmin, GenericInlineModelAdmin):
1715
"""
1816
Base class for variation of inlines based on generic foreign keys.
1917
"""
@@ -51,18 +49,16 @@ def content_type(self):
5149
Expose the ContentType that the child relates to.
5250
This can be used for the ``polymorphic_ctype`` field.
5351
"""
54-
return ContentType.objects.get_for_model(
55-
self.model, for_concrete_model=False
56-
)
52+
return ContentType.objects.get_for_model(self.model, for_concrete_model=False)
5753

5854
def get_formset_child(self, request, obj=None, **kwargs):
5955
# Similar to GenericInlineModelAdmin.get_formset(),
6056
# make sure the GFK is automatically excluded from the form
6157
defaults = {"ct_field": self.ct_field, "fk_field": self.ct_fk_field}
6258
defaults.update(kwargs)
63-
return super(
64-
GenericPolymorphicInlineModelAdmin.Child, self
65-
).get_formset_child(request, obj=obj, **defaults)
59+
return super(GenericPolymorphicInlineModelAdmin.Child, self).get_formset_child(
60+
request, obj=obj, **defaults
61+
)
6662

6763

6864
class GenericStackedPolymorphicInline(GenericPolymorphicInlineModelAdmin):

0 commit comments

Comments
 (0)