[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#16395)

[benjamin.peterson]

http://hg.python.org/cpython/rev/c833c35aa13a
changeset:   90177:c833c35aa13a
parent:      90174:b1ac067c984f
parent:      90175:b2187b82a658
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Apr 08 10:49:09 2014 -0400
summary:
  merge 3.4 (#16395)

files:
  Doc/c-api/sequence.rst |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/c-api/sequence.rst b/Doc/c-api/sequence.rst
--- a/Doc/c-api/sequence.rst
+++ b/Doc/c-api/sequence.rst
@@ -123,10 +123,10 @@
 
 .. c:function:: PyObject* PySequence_Fast(PyObject *o, const char *m)
 
-   Returns the sequence *o* as a tuple, unless it is already a tuple or list, in
-   which case *o* is returned.  Use :c:func:`PySequence_Fast_GET_ITEM` to access the
-   members of the result.  Returns *NULL* on failure.  If the object is not a
-   sequence, raises :exc:`TypeError` with *m* as the message text.
+   Return the sequence *o* as a list, unless it is already a tuple or list, in
+   which case *o* is returned.  Use :c:func:`PySequence_Fast_GET_ITEM` to access
+   the members of the result.  Returns *NULL* on failure.  If the object is not
+   a sequence, raises :exc:`TypeError` with *m* as the message text.
 
 
 .. c:function:: PyObject* PySequence_Fast_GET_ITEM(PyObject *o, Py_ssize_t i)

-- 
Repository URL: http://hg.python.org/cpython