summaryrefslogtreecommitdiff
path: root/tests/delete_regress
diff options
context:
space:
mode:
authorJason Myers <jason@jasonamyers.com>2013-11-02 23:36:09 -0500
committerJason Myers <jason@jasonamyers.com>2013-11-02 23:50:49 -0500
commit7a61c68c50d3837c50e35c252fd76220f08b5290 (patch)
tree586f16a3f02c2b45ffb3dd2af834c0ef604e099c /tests/delete_regress
parent0fdb692c6c94d912f17a3e2ad12413fb072d38ec (diff)
downloaddjango-7a61c68c50d3837c50e35c252fd76220f08b5290.tar.gz
PEP8 cleanup
Signed-off-by: Jason Myers <jason@jasonamyers.com>
Diffstat (limited to 'tests/delete_regress')
-rw-r--r--tests/delete_regress/models.py28
-rw-r--r--tests/delete_regress/tests.py3
2 files changed, 30 insertions, 1 deletions
diff --git a/tests/delete_regress/models.py b/tests/delete_regress/models.py
index 3632a7dbc1..033689519a 100644
--- a/tests/delete_regress/models.py
+++ b/tests/delete_regress/models.py
@@ -2,51 +2,64 @@ from django.contrib.contenttypes import generic
from django.contrib.contenttypes.models import ContentType
from django.db import models
+
class Award(models.Model):
name = models.CharField(max_length=25)
object_id = models.PositiveIntegerField()
content_type = models.ForeignKey(ContentType)
content_object = generic.GenericForeignKey()
+
class AwardNote(models.Model):
award = models.ForeignKey(Award)
note = models.CharField(max_length=100)
+
class Person(models.Model):
name = models.CharField(max_length=25)
awards = generic.GenericRelation(Award)
+
class Book(models.Model):
pagecount = models.IntegerField()
+
class Toy(models.Model):
name = models.CharField(max_length=50)
+
class Child(models.Model):
name = models.CharField(max_length=50)
toys = models.ManyToManyField(Toy, through='PlayedWith')
+
class PlayedWith(models.Model):
child = models.ForeignKey(Child)
toy = models.ForeignKey(Toy)
date = models.DateField(db_column='date_col')
+
class PlayedWithNote(models.Model):
played = models.ForeignKey(PlayedWith)
note = models.TextField()
+
class Contact(models.Model):
label = models.CharField(max_length=100)
+
class Email(Contact):
email_address = models.EmailField(max_length=100)
+
class Researcher(models.Model):
contacts = models.ManyToManyField(Contact, related_name="research_contacts")
+
class Food(models.Model):
name = models.CharField(max_length=20, unique=True)
+
class Eaten(models.Model):
food = models.ForeignKey(Food, to_field="name")
meal = models.CharField(max_length=20)
@@ -54,55 +67,70 @@ class Eaten(models.Model):
# Models for #15776
+
class Policy(models.Model):
policy_number = models.CharField(max_length=10)
+
class Version(models.Model):
policy = models.ForeignKey(Policy)
+
class Location(models.Model):
version = models.ForeignKey(Version, blank=True, null=True)
+
class Item(models.Model):
version = models.ForeignKey(Version)
location = models.ForeignKey(Location, blank=True, null=True)
# Models for #16128
+
class File(models.Model):
pass
+
class Image(File):
class Meta:
proxy = True
+
class Photo(Image):
class Meta:
proxy = True
+
class FooImage(models.Model):
my_image = models.ForeignKey(Image)
+
class FooFile(models.Model):
my_file = models.ForeignKey(File)
+
class FooPhoto(models.Model):
my_photo = models.ForeignKey(Photo)
+
class FooFileProxy(FooFile):
class Meta:
proxy = True
+
class OrgUnit(models.Model):
name = models.CharField(max_length=64, unique=True)
+
class Login(models.Model):
description = models.CharField(max_length=32)
orgunit = models.ForeignKey(OrgUnit)
+
class House(models.Model):
address = models.CharField(max_length=32)
+
class OrderedPerson(models.Model):
name = models.CharField(max_length=32)
lives_in = models.ForeignKey(House)
diff --git a/tests/delete_regress/tests.py b/tests/delete_regress/tests.py
index ecc754920c..e1cbe7070f 100644
--- a/tests/delete_regress/tests.py
+++ b/tests/delete_regress/tests.py
@@ -146,7 +146,7 @@ class LargeDeleteTests(TestCase):
def test_large_deletes(self):
"Regression for #13309 -- if the number of objects > chunk size, deletion still occurs"
for x in range(300):
- Book.objects.create(pagecount=x+100)
+ Book.objects.create(pagecount=x + 100)
# attach a signal to make sure we will not fast-delete
def noop(*args, **kwargs):
@@ -268,6 +268,7 @@ class ProxyDeleteTest(TestCase):
with self.assertRaises(TypeError):
Image.objects.values_list().delete()
+
class Ticket19102Tests(TestCase):
"""
Test different queries which alter the SELECT clause of the query. We