summaryrefslogtreecommitdiffstats
path: root/Doc/library/functions.rst
diff options
context:
space:
mode:
authorChris Jerdonek <chris.jerdonek@gmail.com>2012-10-07 21:56:27 (GMT)
committerChris Jerdonek <chris.jerdonek@gmail.com>2012-10-07 21:56:27 (GMT)
commit042fa653ab91c05dfb50e227361ba345e45169c7 (patch)
tree542da728dee2e9536ff28a261aefb5005437d900 /Doc/library/functions.rst
parent3e5dae0ee290a2f16e14e8f9af01dd0214063f21 (diff)
parent83fe2e1c22e6ff72a308e82e1e24ca03f8c51339 (diff)
downloadcpython-042fa653ab91c05dfb50e227361ba345e45169c7.zip
cpython-042fa653ab91c05dfb50e227361ba345e45169c7.tar.gz
cpython-042fa653ab91c05dfb50e227361ba345e45169c7.tar.bz2
Issue #14783: Merge changes from 3.2.
Diffstat (limited to 'Doc/library/functions.rst')
-rw-r--r--Doc/library/functions.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index c2b3b21..e969194 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1203,7 +1203,8 @@ are always available. They are listed here in alphabetical order.
.. _func-str:
-.. function:: str([object[, encoding[, errors]]])
+.. function:: str(object='')
+ str(object[, encoding[, errors]])
Return a string version of an object, using one of the following modes: