Ticket #7366: no-dicts-on-doctest-output.patch

tests/modeltests/basic/models.py

@@ -401 +401 @@
 
 # The 'select' argument to extra() supports names with dashes in them, as long
 # as you use values().
->>> Article.objects.filter(pub_date__year=2008).extra(select={'dashed-value': '1'}).values('headline', 'dashed-value')
-[{'headline': u'Article 11', 'dashed-value': 1}, {'headline': u'Article 12', 'dashed-value': 1}]
+>>> dicts = Article.objects.filter(pub_date__year=2008).extra(select={'dashed-value': '1'}).values('headline', 'dashed-value')
+>>> [(d['headline'], d['dashed-value']) for d in dicts]
+[(u'Article 11', 1), (u'Article 12', 1)]
 
 # If you use 'select' with extra() and names containing dashes on a query
 # that's *not* a values() query, those extra 'select' values will silently be

tests/modeltests/or_lookups/models.py

@@ -110 +110 @@
 >>> Article.objects.filter(Q(headline__startswith='Hello') | Q(headline__contains='bye')).count()
 3
 
->>> list(Article.objects.filter(Q(headline__startswith='Hello'), Q(headline__contains='bye')).values())
-[{'headline': u'Hello and goodbye', 'pub_date': datetime.datetime(2005, 11, 29, 0, 0), 'id': 3}]
+>>> dict_list = list(Article.objects.filter(Q(headline__startswith='Hello'), Q(headline__contains='bye')).values())
+>>> [(d['headline'], d['pub_date'], d['id']) for d in dict_list]
+[(u'Hello and goodbye', datetime.datetime(2005, 11, 29, 0, 0), 3)]
 
 >>> Article.objects.filter(Q(headline__startswith='Hello')).in_bulk([1,2])
 {1: <Article: Hello>}

tests/regressiontests/defaultfilters/tests.py

@@ -226 +226 @@
 >>> striptags(u'some <b>html</b> with <script>alert("You smell")</script> disallowed <img /> tags')
 u'some html with alert("You smell") disallowed  tags'
 
->>> dictsort([{'age': 23, 'name': 'Barbara-Ann'},
-...           {'age': 63, 'name': 'Ra Ra Rasputin'},
-...           {'name': 'Jonny B Goode', 'age': 18}], 'age')
-[{'age': 18, 'name': 'Jonny B Goode'}, {'age': 23, 'name': 'Barbara-Ann'}, {'age': 63, 'name': 'Ra Ra Rasputin'}]
+>>> sorted_dicts = dictsort([{'age': 23, 'name': 'Barbara-Ann'},
+...                          {'age': 63, 'name': 'Ra Ra Rasputin'},
+...                          {'name': 'Jonny B Goode', 'age': 18}], 'age')
+>>> [(dict['age'], dict['name']) for dict in sorted_dicts]
+[(18, 'Jonny B Goode'), (23, 'Barbara-Ann'), (63, 'Ra Ra Rasputin')]
 
->>> dictsortreversed([{'age': 23, 'name': 'Barbara-Ann'},
-...           {'age': 63, 'name': 'Ra Ra Rasputin'},
-...           {'name': 'Jonny B Goode', 'age': 18}], 'age')
-[{'age': 63, 'name': 'Ra Ra Rasputin'}, {'age': 23, 'name': 'Barbara-Ann'}, {'age': 18, 'name': 'Jonny B Goode'}]
+>>> sorted_dicts = dictsortreversed([{'age': 23, 'name': 'Barbara-Ann'},
+...                                  {'age': 63, 'name': 'Ra Ra Rasputin'},
+...                                  {'name': 'Jonny B Goode', 'age': 18}], 'age')
+>>> [(dict['age'], dict['name']) for dict in sorted_dicts]
+[(63, 'Ra Ra Rasputin'), (23, 'Barbara-Ann'), (18, 'Jonny B Goode')]
 
 >>> first([0,1,2])
 0

tests/regressiontests/queries/models.py

@@ -503 +503 @@
 
 # Despite having some extra aliases in the query, we can still omit them in a
 # values() query.
->>> qs.values('id', 'rank').order_by('id')
-[{'id': 1, 'rank': 2}, {'id': 2, 'rank': 1}, {'id': 3, 'rank': 3}]
+>>> dicts = qs.values('id', 'rank').order_by('id')
+>>> [(d['id'], d['rank']) for d in dicts]
+[(1, 2), (2, 1), (3, 3)]
 
 Bugs #2874, #3002
 >>> qs = Item.objects.select_related().order_by('note__note', 'name')