mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-14 14:55:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #14783: Merge changes from 3.2.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
Objects/unicodeobject.c
View file

@ -14074,7 +14074,8 @@ onError:
}
PyDoc_STRVAR(unicode_doc,
"str(object[, encoding[, errors]]) -> str\n\
"str(object='') -> str\n\
str(bytes_or_buffer[, encoding[, errors]]) -> str\n\
\n\
Create a new string object from the given object. If encoding or\n\
errors is specified, then the object must expose a data buffer\n\