summaryrefslogtreecommitdiff
path: root/tests/modeltests/custom_columns
diff options
context:
space:
mode:
authorJustin Bronn <jbronn@gmail.com>2008-04-27 17:17:04 +0000
committerJustin Bronn <jbronn@gmail.com>2008-04-27 17:17:04 +0000
commite973fea91c4e5924f1d0d709b9c8f0d069380709 (patch)
tree135c266171c5492bbb095e333e9737eb87c32665 /tests/modeltests/custom_columns
parent5456919782e5cd0b885dd383d57e187a06148307 (diff)
gis: Merged revisions 7458,7471-7473,7476-7478,7480 via svnmerge from trunk.
This includes all necessary patches for compatibility with queryset-refactor. git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/modeltests/custom_columns')
-rw-r--r--tests/modeltests/custom_columns/models.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/modeltests/custom_columns/models.py b/tests/modeltests/custom_columns/models.py
index e1d0bc6e94..a0800299a7 100644
--- a/tests/modeltests/custom_columns/models.py
+++ b/tests/modeltests/custom_columns/models.py
@@ -55,8 +55,8 @@ __test__ = {'API_TESTS':"""
>>> art.save()
>>> art.authors = [a, a2]
-# Although the table and column names on Author have been set to
-# custom values, nothing about using the Author model has changed...
+# Although the table and column names on Author have been set to custom values,
+# nothing about using the Author model has changed...
# Query the available authors
>>> Author.objects.all()
@@ -71,7 +71,7 @@ __test__ = {'API_TESTS':"""
>>> Author.objects.filter(firstname__exact='John')
Traceback (most recent call last):
...
-TypeError: Cannot resolve keyword 'firstname' into field. Choices are: article, id, first_name, last_name
+FieldError: Cannot resolve keyword 'firstname' into field. Choices are: article, first_name, id, last_name
>>> a = Author.objects.get(last_name__exact='Smith')
>>> a.first_name