From 4c3bfe9053766d378999d06ec34ee5fd4e39f511 Mon Sep 17 00:00:00 2001 From: Loic Bistuer Date: Fri, 30 Jan 2015 14:26:13 +0700 Subject: Fixed #24211 -- Removed ValuesQuerySet() and ValuesListQuerySet(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks Anssi Kääriäinen, Marc Tamlyn, and Tim Graham for the reviews. --- tests/queries/tests.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'tests/queries') diff --git a/tests/queries/tests.py b/tests/queries/tests.py index 34fbcde8eb..6f643c898f 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -753,12 +753,12 @@ class Queries1Tests(BaseQuerysetTest): # Multi-valued values() and values_list() querysets should raise errors. self.assertRaisesMessage( TypeError, - 'Cannot use a multi-field ValuesQuerySet as a filter value.', + 'Cannot use multi-field values as a filter value.', lambda: Tag.objects.filter(name__in=Tag.objects.filter(parent=self.t1).values('name', 'id')) ) self.assertRaisesMessage( TypeError, - 'Cannot use a multi-field ValuesListQuerySet as a filter value.', + 'Cannot use multi-field values as a filter value.', lambda: Tag.objects.filter(name__in=Tag.objects.filter(parent=self.t1).values_list('name', 'id')) ) @@ -1288,13 +1288,12 @@ class Queries3Tests(BaseQuerysetTest): ) def test_ticket22023(self): - # only() and defer() are not applicable for ValuesQuerySet - with self.assertRaisesMessage(NotImplementedError, - "ValuesQuerySet does not implement only()"): + with self.assertRaisesMessage(TypeError, + "Cannot call only() after .values() or .values_list()"): Valid.objects.values().only() - with self.assertRaisesMessage(NotImplementedError, - "ValuesQuerySet does not implement defer()"): + with self.assertRaisesMessage(TypeError, + "Cannot call defer() after .values() or .values_list()"): Valid.objects.values().defer() -- cgit v1.3