mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge str docstring fix from 3.2

This commit is contained in:
Nick Coghlan 2012-08-16 14:14:30 +10:00
parent 721738fbee 573b1fd779
commit 0e41628d35
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Objects/unicodeobject.c
View File

@ -14083,11 +14083,15 @@ unicode_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
} }
PyDoc_STRVAR(unicode_doc, PyDoc_STRVAR(unicode_doc,
"str(string[, encoding[, errors]]) -> str\n\ "str(object[, encoding[, errors]]) -> str\n\
\n\ \n\
Create a new string object from the given encoded string.\n\ Create a new string object from the given object. If encoding or\n\
encoding defaults to the current default string encoding.\n\ errors is specified, then the object must expose a data buffer\n\
errors can be 'strict', 'replace' or 'ignore' and defaults to 'strict'."); that will be decoded using the given encoding and error handler.\n\
Otherwise, returns the result of object.__str__() (if defined)\n\
or repr(object).\n\
encoding defaults to sys.getdefaultencoding().\n\
errors defaults to 'strict'.");
static PyObject *unicode_iter(PyObject *seq); static PyObject *unicode_iter(PyObject *seq);