merge with 3.2

sandrotosi · sandrotosi · commit 131160c5ccda · 2012-08-12T10:25:10.000+02:00
diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
@@ -297,7 +297,7 @@ which, in turn, is the same as::
 In the real world, you should prefer built-in functions to complex flow statements.
 The :func:`zip` function would do a great job for this use case::
 
-   >>> zip(*matrix)
+   >>> list(zip(*matrix))
    [(1, 5, 9), (2, 6, 10), (3, 7, 11), (4, 8, 12)]
 
 See :ref:`tut-unpacking-arguments` for details on the asterisk in this line.
