summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-07-19 16:35:08 -0700
committerBenjamin Peterson <benjamin@python.org>2014-07-19 16:35:08 -0700
commit0172b115db6b63ee2faa7823b530128949f8fdef (patch)
treea92a7fd809df2a3f95b656eb9a6a0a2b38d6b3e4
parent866bbf1cf541aadc641c5b9ac550d14e4914eb95 (diff)
parent102488b644cceebb1a769a736f305f34e78abdc3 (diff)
downloadcpython-git-0172b115db6b63ee2faa7823b530128949f8fdef.tar.gz
merge 3.4 (#17210)
-rw-r--r--Doc/c-api/unicode.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
index 0f0419c121..4352351cca 100644
--- 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)