Skip to content

Commit

Permalink
PEP8 cleanup
Browse files Browse the repository at this point in the history
Signed-off-by: Jason Myers <jason@jasonamyers.com>
  • Loading branch information
jasonamyers committed Nov 3, 2013
1 parent 0fdb692 commit 7a61c68
Show file tree
Hide file tree
Showing 128 changed files with 739 additions and 206 deletions.
15 changes: 15 additions & 0 deletions tests/admin_changelist/models.py
Original file line number Diff line number Diff line change
@@ -1,33 +1,40 @@
from django.db import models
from django.utils.encoding import python_2_unicode_compatible


class Event(models.Model):
# Oracle can have problems with a column named "date"
date = models.DateField(db_column="event_date")


class Parent(models.Model):
name = models.CharField(max_length=128)


class Child(models.Model):
parent = models.ForeignKey(Parent, editable=False, null=True)
name = models.CharField(max_length=30, blank=True)
age = models.IntegerField(null=True, blank=True)


class Genre(models.Model):
name = models.CharField(max_length=20)


class Band(models.Model):
name = models.CharField(max_length=20)
nr_of_members = models.PositiveIntegerField()
genres = models.ManyToManyField(Genre)


@python_2_unicode_compatible
class Musician(models.Model):
name = models.CharField(max_length=30)

def __str__(self):
return self.name


@python_2_unicode_compatible
class Group(models.Model):
name = models.CharField(max_length=30)
Expand All @@ -36,26 +43,32 @@ class Group(models.Model):
def __str__(self):
return self.name


class Membership(models.Model):
music = models.ForeignKey(Musician)
group = models.ForeignKey(Group)
role = models.CharField(max_length=15)


class Quartet(Group):
pass


class ChordsMusician(Musician):
pass


class ChordsBand(models.Model):
name = models.CharField(max_length=30)
members = models.ManyToManyField(ChordsMusician, through='Invitation')


class Invitation(models.Model):
player = models.ForeignKey(ChordsMusician)
band = models.ForeignKey(ChordsBand)
instrument = models.CharField(max_length=15)


class Swallow(models.Model):
origin = models.CharField(max_length=255)
load = models.FloatField()
Expand All @@ -77,6 +90,7 @@ class OrderedObjectManager(models.Manager):
def get_queryset(self):
return super(OrderedObjectManager, self).get_queryset().order_by('number')


class OrderedObject(models.Model):
"""
Model with Manager that defines a default order.
Expand All @@ -88,5 +102,6 @@ class OrderedObject(models.Model):

objects = OrderedObjectManager()


class CustomIdUser(models.Model):
uuid = models.AutoField(primary_key=True)
2 changes: 2 additions & 0 deletions tests/admin_custom_urls/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ def wrapper(*args, **kwargs):
class Person(models.Model):
name = models.CharField(max_length=20)


class PersonAdmin(admin.ModelAdmin):

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


class CarAdmin(admin.ModelAdmin):

def response_add(self, request, obj, post_url_continue=None):
Expand Down
2 changes: 2 additions & 0 deletions tests/admin_docs/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

xview_dec = decorator_from_middleware(XViewMiddleware)


def xview(request):
return HttpResponse()


class XViewClass(View):
def get(self, request):
return HttpResponse()
1 change: 1 addition & 0 deletions tests/admin_filters/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class Department(models.Model):
def __str__(self):
return self.description


@python_2_unicode_compatible
class Employee(models.Model):
department = models.ForeignKey(Department, to_field="code")
Expand Down
3 changes: 3 additions & 0 deletions tests/admin_inlines/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ class ChildModel1Inline(admin.TabularInline):
class ChildModel2Inline(admin.StackedInline):
model = ChildModel2


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


# admin for #19524
class SightingInline(admin.TabularInline):
model = Sighting


# admin and form for #18263
class SomeChildModelForm(forms.ModelForm):

Expand Down
21 changes: 21 additions & 0 deletions tests/admin_inlines/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ class Inner2(models.Model):
dummy = models.IntegerField()
holder = models.ForeignKey(Holder2)


class Holder3(models.Model):
dummy = models.IntegerField()

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

# Models for ticket #8190


class Holder4(models.Model):
dummy = models.IntegerField()


class Inner4Stacked(models.Model):
dummy = models.IntegerField(help_text="Awesome stacked help text is awesome.")
holder = models.ForeignKey(Holder4)


class Inner4Tabular(models.Model):
dummy = models.IntegerField(help_text="Awesome tabular help text is awesome.")
holder = models.ForeignKey(Holder4)

# Models for #12749


class Person(models.Model):
firstname = models.CharField(max_length=15)


class OutfitItem(models.Model):
name = models.CharField(max_length=15)


class Fashionista(models.Model):
person = models.OneToOneField(Person, primary_key=True)
weaknesses = models.ManyToManyField(OutfitItem, through='ShoppingWeakness', blank=True)


class ShoppingWeakness(models.Model):
fashionista = models.ForeignKey(Fashionista)
item = models.ForeignKey(OutfitItem)

# Models for #13510


class TitleCollection(models.Model):
pass


class Title(models.Model):
collection = models.ForeignKey(TitleCollection, blank=True, null=True)
title1 = models.CharField(max_length=100)
title2 = models.CharField(max_length=100)

# Models for #15424


class Poll(models.Model):
name = models.CharField(max_length=40)


class Question(models.Model):
poll = models.ForeignKey(Poll)


class Novel(models.Model):
name = models.CharField(max_length=40)


class Chapter(models.Model):
name = models.CharField(max_length=40)
novel = models.ForeignKey(Novel)


class FootNote(models.Model):
"""
Model added for ticket 19838
Expand All @@ -160,6 +175,7 @@ class FootNote(models.Model):

# Models for #16838


class CapoFamiglia(models.Model):
name = models.CharField(max_length=100)

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

# Models for #19524


class LifeForm(models.Model):
pass


class ExtraTerrestrial(LifeForm):
name = models.CharField(max_length=100)


class Sighting(models.Model):
et = models.ForeignKey(ExtraTerrestrial)
place = models.CharField(max_length=100)
Expand All @@ -234,9 +253,11 @@ class SomeChildModel(models.Model):

# Other models


class ProfileCollection(models.Model):
pass


class Profile(models.Model):
collection = models.ForeignKey(ProfileCollection, blank=True, null=True)
first_name = models.CharField(max_length=100)
Expand Down
24 changes: 13 additions & 11 deletions tests/admin_inlines/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ def test_all_inline_media(self):
self.assertContains(response, 'my_awesome_admin_scripts.js')
self.assertContains(response, 'my_awesome_inline_scripts.js')


class TestInlineAdminForm(TestCase):
urls = "admin_inlines.urls"

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

def test_inline_change_fk_change_perm(self):
permission = Permission.objects.get(codename='change_inner2', content_type=self.inner_ct)
Expand All @@ -477,12 +478,12 @@ def test_inline_change_fk_change_perm(self):
self.assertContains(response, '<h2>Inner2s</h2>')
# Just the one form for existing instances
self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" '
'value="1" name="inner2_set-TOTAL_FORMS" />', html=True)
'value="1" name="inner2_set-TOTAL_FORMS" />', html=True)
self.assertContains(response, '<input type="hidden" id="id_inner2_set-0-id" '
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
# max-num 0 means we can't add new ones
self.assertContains(response, '<input type="hidden" id="id_inner2_set-MAX_NUM_FORMS" '
'value="0" name="inner2_set-MAX_NUM_FORMS" />', html=True)
'value="0" name="inner2_set-MAX_NUM_FORMS" />', html=True)

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

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

def test_inline_change_fk_all_perms(self):
Expand All @@ -525,9 +526,9 @@ def test_inline_change_fk_all_perms(self):
self.assertContains(response, '<h2>Inner2s</h2>')
# One form for existing instance only, three for new
self.assertContains(response, '<input type="hidden" id="id_inner2_set-TOTAL_FORMS" '
'value="4" name="inner2_set-TOTAL_FORMS" />', html=True)
'value="4" name="inner2_set-TOTAL_FORMS" />', html=True)
self.assertContains(response, '<input type="hidden" id="id_inner2_set-0-id" '
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
'value="%i" name="inner2_set-0-id" />' % self.inner2_id, html=True)
self.assertContains(response, 'id="id_inner2_set-0-DELETE"')


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


class SeleniumIETests(SeleniumFirefoxTests):
webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver'
4 changes: 4 additions & 0 deletions tests/admin_ordering/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class Band(models.Model):
class Meta:
ordering = ('name',)


class Song(models.Model):
band = models.ForeignKey(Band)
name = models.CharField(max_length=100)
Expand All @@ -20,13 +21,16 @@ class Song(models.Model):
class Meta:
ordering = ('name',)


class SongInlineDefaultOrdering(admin.StackedInline):
model = Song


class SongInlineNewOrdering(admin.StackedInline):
model = Song
ordering = ('duration', )


class DynOrderingBandAdmin(admin.ModelAdmin):

def get_ordering(self, request):
Expand Down
1 change: 1 addition & 0 deletions tests/admin_ordering/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
class MockRequest(object):
pass


class MockSuperUser(object):
def has_perm(self, perm):
return True
Expand Down
Loading

0 comments on commit 7a61c68

Please sign in to comment.