Skip to content

Commit 7a61c68

Browse files
committed
PEP8 cleanup
Signed-off-by: Jason Myers <[email protected]>
1 parent 0fdb692 commit 7a61c68

File tree

128 files changed

+739
-206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+739
-206
lines changed

tests/admin_changelist/models.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,40 @@
11
from django.db import models
22
from django.utils.encoding import python_2_unicode_compatible
33

4+
45
class Event(models.Model):
56
# Oracle can have problems with a column named "date"
67
date = models.DateField(db_column="event_date")
78

9+
810
class Parent(models.Model):
911
name = models.CharField(max_length=128)
1012

13+
1114
class Child(models.Model):
1215
parent = models.ForeignKey(Parent, editable=False, null=True)
1316
name = models.CharField(max_length=30, blank=True)
1417
age = models.IntegerField(null=True, blank=True)
1518

19+
1620
class Genre(models.Model):
1721
name = models.CharField(max_length=20)
1822

23+
1924
class Band(models.Model):
2025
name = models.CharField(max_length=20)
2126
nr_of_members = models.PositiveIntegerField()
2227
genres = models.ManyToManyField(Genre)
2328

29+
2430
@python_2_unicode_compatible
2531
class Musician(models.Model):
2632
name = models.CharField(max_length=30)
2733

2834
def __str__(self):
2935
return self.name
3036

37+
3138
@python_2_unicode_compatible
3239
class Group(models.Model):
3340
name = models.CharField(max_length=30)
@@ -36,26 +43,32 @@ class Group(models.Model):
3643
def __str__(self):
3744
return self.name
3845

46+
3947
class Membership(models.Model):
4048
music = models.ForeignKey(Musician)
4149
group = models.ForeignKey(Group)
4250
role = models.CharField(max_length=15)
4351

52+
4453
class Quartet(Group):
4554
pass
4655

56+
4757
class ChordsMusician(Musician):
4858
pass
4959

60+
5061
class ChordsBand(models.Model):
5162
name = models.CharField(max_length=30)
5263
members = models.ManyToManyField(ChordsMusician, through='Invitation')
5364

65+
5466
class Invitation(models.Model):
5567
player = models.ForeignKey(ChordsMusician)
5668
band = models.ForeignKey(ChordsBand)
5769
instrument = models.CharField(max_length=15)
5870

71+
5972
class Swallow(models.Model):
6073
origin = models.CharField(max_length=255)
6174
load = models.FloatField()
@@ -77,6 +90,7 @@ class OrderedObjectManager(models.Manager):
7790
def get_queryset(self):
7891
return super(OrderedObjectManager, self).get_queryset().order_by('number')
7992

93+
8094
class OrderedObject(models.Model):
8195
"""
8296
Model with Manager that defines a default order.
@@ -88,5 +102,6 @@ class OrderedObject(models.Model):
88102

89103
objects = OrderedObjectManager()
90104

105+
91106
class CustomIdUser(models.Model):
92107
uuid = models.AutoField(primary_key=True)

tests/admin_custom_urls/models.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ def wrapper(*args, **kwargs):
5454
class Person(models.Model):
5555
name = models.CharField(max_length=20)
5656

57+
5758
class PersonAdmin(admin.ModelAdmin):
5859

5960
def response_post_save_add(self, request, obj):
@@ -68,6 +69,7 @@ def response_post_save_change(self, request, obj):
6869
class Car(models.Model):
6970
name = models.CharField(max_length=20)
7071

72+
7173
class CarAdmin(admin.ModelAdmin):
7274

7375
def response_add(self, request, obj, post_url_continue=None):

tests/admin_docs/views.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55

66
xview_dec = decorator_from_middleware(XViewMiddleware)
77

8+
89
def xview(request):
910
return HttpResponse()
1011

12+
1113
class XViewClass(View):
1214
def get(self, request):
1315
return HttpResponse()

tests/admin_filters/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class Department(models.Model):
2727
def __str__(self):
2828
return self.description
2929

30+
3031
@python_2_unicode_compatible
3132
class Employee(models.Model):
3233
department = models.ForeignKey(Department, to_field="code")

tests/admin_inlines/admin.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ class ChildModel1Inline(admin.TabularInline):
153153
class ChildModel2Inline(admin.StackedInline):
154154
model = ChildModel2
155155

156+
156157
# admin for #19425 and #18388
157158
class BinaryTreeAdmin(admin.TabularInline):
158159
model = BinaryTree
@@ -169,10 +170,12 @@ def get_max_num(self, request, obj=None, **kwargs):
169170
return max_num - obj.binarytree_set.count()
170171
return max_num
171172

173+
172174
# admin for #19524
173175
class SightingInline(admin.TabularInline):
174176
model = Sighting
175177

178+
176179
# admin and form for #18263
177180
class SomeChildModelForm(forms.ModelForm):
178181

tests/admin_inlines/models.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ class Inner2(models.Model):
8989
dummy = models.IntegerField()
9090
holder = models.ForeignKey(Holder2)
9191

92+
9293
class Holder3(models.Model):
9394
dummy = models.IntegerField()
9495

@@ -99,58 +100,72 @@ class Inner3(models.Model):
99100

100101
# Models for ticket #8190
101102

103+
102104
class Holder4(models.Model):
103105
dummy = models.IntegerField()
104106

107+
105108
class Inner4Stacked(models.Model):
106109
dummy = models.IntegerField(help_text="Awesome stacked help text is awesome.")
107110
holder = models.ForeignKey(Holder4)
108111

112+
109113
class Inner4Tabular(models.Model):
110114
dummy = models.IntegerField(help_text="Awesome tabular help text is awesome.")
111115
holder = models.ForeignKey(Holder4)
112116

113117
# Models for #12749
114118

119+
115120
class Person(models.Model):
116121
firstname = models.CharField(max_length=15)
117122

123+
118124
class OutfitItem(models.Model):
119125
name = models.CharField(max_length=15)
120126

127+
121128
class Fashionista(models.Model):
122129
person = models.OneToOneField(Person, primary_key=True)
123130
weaknesses = models.ManyToManyField(OutfitItem, through='ShoppingWeakness', blank=True)
124131

132+
125133
class ShoppingWeakness(models.Model):
126134
fashionista = models.ForeignKey(Fashionista)
127135
item = models.ForeignKey(OutfitItem)
128136

129137
# Models for #13510
130138

139+
131140
class TitleCollection(models.Model):
132141
pass
133142

143+
134144
class Title(models.Model):
135145
collection = models.ForeignKey(TitleCollection, blank=True, null=True)
136146
title1 = models.CharField(max_length=100)
137147
title2 = models.CharField(max_length=100)
138148

139149
# Models for #15424
140150

151+
141152
class Poll(models.Model):
142153
name = models.CharField(max_length=40)
143154

155+
144156
class Question(models.Model):
145157
poll = models.ForeignKey(Poll)
146158

159+
147160
class Novel(models.Model):
148161
name = models.CharField(max_length=40)
149162

163+
150164
class Chapter(models.Model):
151165
name = models.CharField(max_length=40)
152166
novel = models.ForeignKey(Novel)
153167

168+
154169
class FootNote(models.Model):
155170
"""
156171
Model added for ticket 19838
@@ -160,6 +175,7 @@ class FootNote(models.Model):
160175

161176
# Models for #16838
162177

178+
163179
class CapoFamiglia(models.Model):
164180
name = models.CharField(max_length=100)
165181

@@ -211,12 +227,15 @@ class BinaryTree(models.Model):
211227

212228
# Models for #19524
213229

230+
214231
class LifeForm(models.Model):
215232
pass
216233

234+
217235
class ExtraTerrestrial(LifeForm):
218236
name = models.CharField(max_length=100)
219237

238+
220239
class Sighting(models.Model):
221240
et = models.ForeignKey(ExtraTerrestrial)
222241
place = models.CharField(max_length=100)
@@ -234,9 +253,11 @@ class SomeChildModel(models.Model):
234253

235254
# Other models
236255

256+
237257
class ProfileCollection(models.Model):
238258
pass
239259

260+
240261
class Profile(models.Model):
241262
collection = models.ForeignKey(ProfileCollection, blank=True, null=True)
242263
first_name = models.CharField(max_length=100)

tests/admin_inlines/tests.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ def test_all_inline_media(self):
279279
self.assertContains(response, 'my_awesome_admin_scripts.js')
280280
self.assertContains(response, 'my_awesome_inline_scripts.js')
281281

282+
282283
class TestInlineAdminForm(TestCase):
283284
urls = "admin_inlines.urls"
284285

@@ -465,9 +466,9 @@ def test_inline_change_fk_add_perm(self):
465466
self.assertContains(response, 'Add another Inner2')
466467
# 3 extra forms only, not the existing instance form
467468
self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" '
468-
'value="3" name="inner2_set-TOTAL_FORMS" />', html=True)
469+
'value="3" name="inner2_set-TOTAL_FORMS" />', html=True)
469470
self.assertNotContains(response, '<input type="hidden" id="id_inner2_set-0-id" '
470-
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
471+
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
471472

472473
def test_inline_change_fk_change_perm(self):
473474
permission = Permission.objects.get(codename='change_inner2', content_type=self.inner_ct)
@@ -477,12 +478,12 @@ def test_inline_change_fk_change_perm(self):
477478
self.assertContains(response, '<h2>Inner2s</h2>')
478479
# Just the one form for existing instances
479480
self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" '
480-
'value="1" name="inner2_set-TOTAL_FORMS" />', html=True)
481+
'value="1" name="inner2_set-TOTAL_FORMS" />', html=True)
481482
self.assertContains(response, '<input type="hidden" id="id_inner2_set-0-id" '
482-
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
483+
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
483484
# max-num 0 means we can't add new ones
484485
self.assertContains(response, '<input type="hidden" id="id_inner2_set-MAX_NUM_FORMS" '
485-
'value="0" name="inner2_set-MAX_NUM_FORMS" />', html=True)
486+
'value="0" name="inner2_set-MAX_NUM_FORMS" />', html=True)
486487

487488
def test_inline_change_fk_add_change_perm(self):
488489
permission = Permission.objects.get(codename='add_inner2', content_type=self.inner_ct)
@@ -494,9 +495,9 @@ def test_inline_change_fk_add_change_perm(self):
494495
self.assertContains(response, '<h2>Inner2s</h2>')
495496
# One form for existing instance and three extra for new
496497
self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" '
497-
'value="4" name="inner2_set-TOTAL_FORMS" />', html=True)
498+
'value="4" name="inner2_set-TOTAL_FORMS" />', html=True)
498499
self.assertContains(response, '<input type="hidden" id="id_inner2_set-0-id" '
499-
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
500+
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
500501

501502
def test_inline_change_fk_change_del_perm(self):
502503
permission = Permission.objects.get(codename='change_inner2', content_type=self.inner_ct)
@@ -508,9 +509,9 @@ def test_inline_change_fk_change_del_perm(self):
508509
self.assertContains(response, '<h2>Inner2s</h2>')
509510
# One form for existing instance only, no new
510511
self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" '
511-
'value="1" name="inner2_set-TOTAL_FORMS" />', html=True)
512+
'value="1" name="inner2_set-TOTAL_FORMS" />', html=True)
512513
self.assertContains(response, '<input type="hidden" id="id_inner2_set-0-id" '
513-
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
514+
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
514515
self.assertContains(response, 'id="id_inner2_set-0-DELETE"')
515516

516517
def test_inline_change_fk_all_perms(self):
@@ -525,9 +526,9 @@ def test_inline_change_fk_all_perms(self):
525526
self.assertContains(response, '<h2>Inner2s</h2>')
526527
# One form for existing instance only, three for new
527528
self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" '
528-
'value="4" name="inner2_set-TOTAL_FORMS" />', html=True)
529+
'value="4" name="inner2_set-TOTAL_FORMS" />', html=True)
529530
self.assertContains(response, '<input type="hidden" id="id_inner2_set-0-id" '
530-
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
531+
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
531532
self.assertContains(response, 'id="id_inner2_set-0-DELETE"')
532533

533534

@@ -698,5 +699,6 @@ def test_alternating_rows(self):
698699
class SeleniumChromeTests(SeleniumFirefoxTests):
699700
webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'
700701

702+
701703
class SeleniumIETests(SeleniumFirefoxTests):
702704
webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver'

tests/admin_ordering/models.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ class Band(models.Model):
1111
class Meta:
1212
ordering = ('name',)
1313

14+
1415
class Song(models.Model):
1516
band = models.ForeignKey(Band)
1617
name = models.CharField(max_length=100)
@@ -20,13 +21,16 @@ class Song(models.Model):
2021
class Meta:
2122
ordering = ('name',)
2223

24+
2325
class SongInlineDefaultOrdering(admin.StackedInline):
2426
model = Song
2527

28+
2629
class SongInlineNewOrdering(admin.StackedInline):
2730
model = Song
2831
ordering = ('duration', )
2932

33+
3034
class DynOrderingBandAdmin(admin.ModelAdmin):
3135

3236
def get_ordering(self, request):

tests/admin_ordering/tests.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
class MockRequest(object):
1313
pass
1414

15+
1516
class MockSuperUser(object):
1617
def has_perm(self, perm):
1718
return True

0 commit comments

Comments
 (0)