Commit 7288e1b0 authored by Alex Gaynor's avatar Alex Gaynor
Browse files

Merge pull request #1852 from jasonamyers/cleanup/PEP8 

Cleanup/pep8 tests
parents 91078f56 4f151da1

django/forms/widgets.py

+2 −1
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ class ClearableFileInput(FileInput): 
        upload = super(ClearableFileInput, self).value_from_datadict(data, files, name)

        if not self.is_required and CheckboxInput().value_from_datadict(

                data, files, self.clear_checkbox_name(name)):



            if upload:

                # If the user contradicts themselves (uploads a new file AND

                # checks the "clear" checkbox), we return a unique marker

setup.cfg

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ install-script = scripts/rpm-install.sh 


[flake8]

exclude=./django/utils/dictconfig.py,./django/contrib/comments/*,./django/utils/unittest.py,./tests/comment_tests/*,./django/test/_doctest.py,./django/utils/six.py,./django/conf/app_template/*

ignore=E124,E125,E127,E128,E226,E251,E302,E501,W601

ignore=E124,E125,E127,E128,E226,E251,E501,W601



[metadata]

license-file = LICENSE

tests/admin_changelist/models.py

+15 −0
Original line number Diff line number Diff line 
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)
@@ -28,6 +34,7 @@ class Musician(models.Model): 
    def __str__(self):

        return self.name





@python_2_unicode_compatible

class Group(models.Model):

    name = models.CharField(max_length=30)
@@ -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()
@@ -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.
@@ -88,5 +102,6 @@ class OrderedObject(models.Model): 


    objects = OrderedObjectManager()





class CustomIdUser(models.Model):

    uuid = models.AutoField(primary_key=True)

tests/admin_custom_urls/models.py

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ class ActionAdmin(admin.ModelAdmin): 
class Person(models.Model):

    name = models.CharField(max_length=20)





class PersonAdmin(admin.ModelAdmin):



    def response_post_save_add(self, request, obj):
@@ -68,6 +69,7 @@ class PersonAdmin(admin.ModelAdmin): 
class Car(models.Model):

    name = models.CharField(max_length=20)





class CarAdmin(admin.ModelAdmin):



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

tests/admin_docs/views.py

+2 −0
Original line number Diff line number Diff line
@@ -5,9 +5,11 @@ from django.contrib.admindocs.middleware import XViewMiddleware 


xview_dec = decorator_from_middleware(XViewMiddleware)





def xview(request):

    return HttpResponse()





class XViewClass(View):

    def get(self, request):

        return HttpResponse()