diff options
| author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-10-07 22:02:16 (GMT) |
|---|---|---|
| committer | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-10-07 22:02:16 (GMT) |
| commit | 4a7df9aba91605c8e689b735f119837d9b9c89b4 (patch) | |
| tree | e76e3bb7ab8f143c9cc6ac558bfcab352d1acc90 /Objects/unicodeobject.c | |
| parent | 8836eefb1e27e845c0403dc39f6463c4de795760 (diff) | |
| parent | 042fa653ab91c05dfb50e227361ba345e45169c7 (diff) | |
| download | cpython-4a7df9aba91605c8e689b735f119837d9b9c89b4.zip cpython-4a7df9aba91605c8e689b735f119837d9b9c89b4.tar.gz cpython-4a7df9aba91605c8e689b735f119837d9b9c89b4.tar.bz2 | |
Issue #14783: Merge changes from 3.3.
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 73a3dc4..b4c7ecf 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -14133,7 +14133,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\ |