mirror of
https://github.com/python/cpython.git
synced 2025-09-26 02:10:18 +00:00
Issue #14783: Backport changes from 3.2.
This commit is contained in:
parent
e4831f6b12
commit
ad4b000179
9 changed files with 44 additions and 24 deletions
|
@ -1861,7 +1861,7 @@ char utf8_code_length[256] = {
|
|||
illegal prefix. See RFC 3629 for details */
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 00-0F */
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
|
@ -2217,7 +2217,7 @@ PyUnicode_DecodeUTF32Stateful(const char *s,
|
|||
#endif
|
||||
PyObject *errorHandler = NULL;
|
||||
PyObject *exc = NULL;
|
||||
|
||||
|
||||
q = (unsigned char *)s;
|
||||
e = q + size;
|
||||
|
||||
|
@ -8759,7 +8759,8 @@ unicode_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|||
}
|
||||
|
||||
PyDoc_STRVAR(unicode_doc,
|
||||
"unicode(string [, encoding[, errors]]) -> object\n\
|
||||
"unicode(object='') -> unicode object\n\
|
||||
unicode(string[, encoding[, errors]]) -> unicode object\n\
|
||||
\n\
|
||||
Create a new Unicode object from the given encoded string.\n\
|
||||
encoding defaults to the current default string encoding.\n\
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue