From 985e4c8dfe9d79ffc33af6dc64973c20c01f7485 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 23 Mar 2010 14:11:41 +0000 Subject: [PATCH] Fixed #13171 -- Corrected the field_subclassing unit test. Thanks to Gabriel Hurley for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12838 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/modeltests/field_subclassing/fields.py | 4 ++-- tests/modeltests/field_subclassing/models.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/modeltests/field_subclassing/fields.py b/tests/modeltests/field_subclassing/fields.py index d545b1968d..a43714dcf5 100644 --- a/tests/modeltests/field_subclassing/fields.py +++ b/tests/modeltests/field_subclassing/fields.py @@ -41,14 +41,14 @@ class SmallField(models.Field): def get_db_prep_save(self, value): return unicode(value) - def get_db_prep_lookup(self, lookup_type, value): + def get_prep_lookup(self, lookup_type, value): if lookup_type == 'exact': return force_unicode(value) if lookup_type == 'in': return [force_unicode(v) for v in value] if lookup_type == 'isnull': return [] - raise FieldError('Invalid lookup type: %r' % lookup_type) + raise TypeError('Invalid lookup type: %r' % lookup_type) class JSONField(models.TextField): diff --git a/tests/modeltests/field_subclassing/models.py b/tests/modeltests/field_subclassing/models.py index 93b30c2ec2..a9fe88fe77 100644 --- a/tests/modeltests/field_subclassing/models.py +++ b/tests/modeltests/field_subclassing/models.py @@ -51,7 +51,7 @@ True >>> MyModel.objects.filter(data__lt=s) Traceback (most recent call last): ... -FieldError: Invalid lookup type: 'lt' +TypeError: Invalid lookup type: 'lt' # Serialization works, too. >>> stream = serializers.serialize("json", MyModel.objects.all())