Issue #14783: Merge changes from 3.2.

This commit is contained in:
Chris Jerdonek 2012-10-07 14:56:27 -07:00
commit 042fa653ab
6 changed files with 25 additions and 11 deletions

View file

@ -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: