merge 3.4 (#17210)

2014-07-19 16:35:08 -07:00 · 2014-07-19 16:35:08 -07:00 · 0172b115db
parent 866bbf1cf5 102488b644
commit 0172b115db
1 changed files with 1 additions and 1 deletions
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@ -1646,7 +1646,7 @@ They all return *NULL* or ``-1`` if an exception occurs.
 .. c:function:: PyObject* PyUnicode_Format(PyObject *format, PyObject *args)

   Return a new string object from *format* and *args*; this is analogous to
-   ``format % args``.  The *args* argument must be a tuple.
+   ``format % args``.


 .. c:function:: int PyUnicode_Contains(PyObject *container, PyObject *element)