From 1eee40234b8366617fa3455cd7c4d16f754fe830 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Wed, 10 Mar 2010 03:41:41 +0000 Subject: [PATCH] Fixed #11711 -- clarified that ValuesQuerySets are not lists per se. It rarely hurts to think of the returned result from a values() or values_list() call as a list, but it's really an iterable and sometimes the difference matters. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12743 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/models/querysets.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index b334240b6c..de8dce7a55 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -361,8 +361,8 @@ query spans multiple tables, it's possible to get duplicate results when a ``values(*fields)`` ~~~~~~~~~~~~~~~~~~~ -Returns a ``ValuesQuerySet`` -- a ``QuerySet`` that evaluates to a list of -dictionaries instead of model-instance objects. +Returns a ``ValuesQuerySet`` -- a ``QuerySet`` that returns dictionaries when +used as an iterable, rather than model-instance objects. Each of those dictionaries represents an object, with the keys corresponding to the attribute names of model objects. @@ -446,10 +446,10 @@ individualism. .. versionadded:: 1.0 -This is similar to ``values()`` except that instead of returning a list of -dictionaries, it returns a list of tuples. Each tuple contains the value from -the respective field passed into the ``values_list()`` call -- so the first -item is the first field, etc. For example:: +This is similar to ``values()`` except that instead of returning dictionaries, +it returns tuples when iterated over. Each tuple contains the value from the +respective field passed into the ``values_list()`` call -- so the first item is +the first field, etc. For example:: >>> Entry.objects.values_list('id', 'headline') [(1, u'First entry'), ...]