Fixed #24211 -- Removed ValuesQuerySet() and ValuesListQuerySet().

Thanks Anssi Kääriäinen, Marc Tamlyn, and Tim Graham for the reviews.

4 files changed, 9 insertions, 12 deletions

diff --git a/tests/aggregation_regress/tests.py b/tests/aggregation_regress/tests.py
index 8d2a006137..e7a457fb58 100644
--- a/tests/aggregation_regress/tests.py
+++ b/tests/aggregation_regress/tests.py
@@ -511,7 +511,7 @@ class AggregationTests(TestCase):
         # Regression for #14707 -- If you're using a values query set, some potential conflicts are avoided.
 
         # age is a field on Author, so it shouldn't be allowed as an aggregate.
-        # But age isn't included in the ValuesQuerySet, so it is.
+        # But age isn't included in values(), so it is.
         results = Author.objects.values('name').annotate(age=Count('book_contact_set')).order_by('name')
         self.assertEqual(len(results), 9)
         self.assertEqual(results[0]['name'], 'Adrian Holovaty')
diff --git a/tests/basic/tests.py b/tests/basic/tests.py
index 72fdbaa8d8..3f91835f16 100644
--- a/tests/basic/tests.py
+++ b/tests/basic/tests.py
@@ -10,7 +10,7 @@ from django.db import DatabaseError
 from django.db.models.fields import Field
 from django.db.models.fields.related import ForeignObjectRel
 from django.db.models.manager import BaseManager
-from django.db.models.query import QuerySet, EmptyQuerySet, ValuesListQuerySet, MAX_GET_RESULTS
+from django.db.models.query import QuerySet, EmptyQuerySet, MAX_GET_RESULTS
 from django.test import TestCase, TransactionTestCase, skipIfDBFeature, skipUnlessDBFeature
 from django.utils import six
 from django.utils.translation import ugettext_lazy
@@ -383,7 +383,6 @@ class ModelTest(TestCase):
         with self.assertNumQueries(0):
             qs = Article.objects.none().values_list('pk')
             self.assertIsInstance(qs, EmptyQuerySet)
-            self.assertIsInstance(qs, ValuesListQuerySet)
             self.assertEqual(len(qs), 0)
 
     def test_emptyqs_customqs(self):
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()
 
 
diff --git a/tests/queryset_pickle/tests.py b/tests/queryset_pickle/tests.py
index 91fe304f9d..c56b7179d2 100644
--- a/tests/queryset_pickle/tests.py
+++ b/tests/queryset_pickle/tests.py
@@ -99,8 +99,7 @@ class PickleabilityTestCase(TestCase):
     def test_specialized_queryset(self):
         self.assert_pickles(Happening.objects.values('name'))
         self.assert_pickles(Happening.objects.values('name').dates('when', 'year'))
-
-        # ValuesQuerySet with related field (#14515)
+        # With related field (#14515)
         self.assert_pickles(
             Event.objects.select_related('group').order_by('title').values_list('title', 'group__name')
         )