diff options
| author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-10-08 03:37:54 (GMT) |
|---|---|---|
| committer | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-10-08 03:37:54 (GMT) |
| commit | ad4b0001794e47368b0997183b30b1171eab2790 (patch) | |
| tree | a390e85fcddef84bd3182a420836fa52447c4649 /Objects/unicodeobject.c | |
| parent | e4831f6b1296869afd7ac88e674196a599542d50 (diff) | |
| download | cpython-ad4b0001794e47368b0997183b30b1171eab2790.zip cpython-ad4b0001794e47368b0997183b30b1171eab2790.tar.gz cpython-ad4b0001794e47368b0997183b30b1171eab2790.tar.bz2 | |
Issue #14783: Backport changes from 3.2.
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index d40f2e4..e3c2cb1 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -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\ |