summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBoulder Sprinters <boulder-sprinters@djangoproject.com>2007-03-14 23:04:08 +0000
committerBoulder Sprinters <boulder-sprinters@djangoproject.com>2007-03-14 23:04:08 +0000
commit385f99433bc9fd69bb8ce05e9a47e39496945ba6 (patch)
tree0e11ea0dfee3e66952a5e502b9b1b0ba5253a431 /tests
parent871f497e670a488378b79676116f57ae7a464e8e (diff)
boulder-oracle-sprint: Add in a few small trunk changes that svn merge had
missed. git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@4729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
-rw-r--r--tests/modeltests/basic/models.py2
-rw-r--r--tests/modeltests/many_to_one/models.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/modeltests/basic/models.py b/tests/modeltests/basic/models.py
index 062f8b29ed..9af13c0e3e 100644
--- a/tests/modeltests/basic/models.py
+++ b/tests/modeltests/basic/models.py
@@ -9,8 +9,6 @@ from django.db import models
class Article(models.Model):
headline = models.CharField(maxlength=100, default='Default headline')
pub_date = models.DateTimeField()
- class Meta:
- ordering = ('pub_date',)
class Meta:
ordering = ('pub_date','headline')
diff --git a/tests/modeltests/many_to_one/models.py b/tests/modeltests/many_to_one/models.py
index 392bcdf73c..82eb3257d0 100644
--- a/tests/modeltests/many_to_one/models.py
+++ b/tests/modeltests/many_to_one/models.py
@@ -155,7 +155,7 @@ False
[<Article: John's second story>, <Article: This is a test>]
# Find all Articles for the Reporter whose ID is 1.
-# Use direct ID check, pk check, and object comparison
+# Use direct ID check, pk check, and object comparison
>>> Article.objects.filter(reporter__id__exact=1)
[<Article: John's second story>, <Article: This is a test>]
>>> Article.objects.filter(reporter__pk=1)