diff options
| author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-10-07 21:56:27 (GMT) |
|---|---|---|
| committer | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-10-07 21:56:27 (GMT) |
| commit | 042fa653ab91c05dfb50e227361ba345e45169c7 (patch) | |
| tree | 542da728dee2e9536ff28a261aefb5005437d900 /Objects/unicodeobject.c | |
| parent | 3e5dae0ee290a2f16e14e8f9af01dd0214063f21 (diff) | |
| parent | 83fe2e1c22e6ff72a308e82e1e24ca03f8c51339 (diff) | |
| download | cpython-042fa653ab91c05dfb50e227361ba345e45169c7.zip cpython-042fa653ab91c05dfb50e227361ba345e45169c7.tar.gz cpython-042fa653ab91c05dfb50e227361ba345e45169c7.tar.bz2 | |
Issue #14783: Merge changes from 3.2.
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 8289580..6c8fe2d 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -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\ |