Mailman 3 December 2011 - Python-checkins

cpython: Fix PyObject_Repr(): don't call PyUnicode_READY() if res is NULL
by victor.stinner Dec. 1, 2011

Dec. 1, 2011

http://hg.python.org/cpython/rev/0d1536ec44e8 changeset: 73804:0d1536ec44e8 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Dec 01 03:22:44 2011 +0100 summary: Fix PyObject_Repr(): don't call PyUnicode_READY() if res is NULL files: Objects/object.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -378,7 +378,9 @@ return PyUnicode_FromFormat("<%s object at %p>", v->ob_type->tp_name, v); res = (*v->ob_type->tp_repr)(v); - if (res != NULL && !PyUnicode_Check(res)) { + if (res == NULL) + return NULL; + if (!PyUnicode_Check(res)) { PyErr_Format(PyExc_TypeError, "__repr__ returned non-string (type %.200s)", res->ob_type->tp_name); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Replace PyUnicode_FromUnicode(NULL, 0) by PyUnicode_New(0, 0)
by victor.stinner Dec. 1, 2011

Dec. 1, 2011

http://hg.python.org/cpython/rev/d855329d0f72 changeset: 73803:d855329d0f72 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Dec 01 03:18:59 2011 +0100 summary: Replace PyUnicode_FromUnicode(NULL, 0) by PyUnicode_New(0, 0) Create an empty string with the new Unicode API. files: Modules/cjkcodecs/multibytecodec.c | 4 ++-- Objects/stringlib/unicode_format.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -633,7 +633,7 @@ if (datalen == 0) { PyBuffer_Release(&pdata); ERROR_DECREF(errorcb); - return make_tuple(PyUnicode_FromUnicode(NULL, 0), 0); + return make_tuple(PyUnicode_New(0, 0), 0); } buf.excobj = NULL; @@ -1265,7 +1265,7 @@ Py_ssize_t rsize, finalsize = 0; if (sizehint == 0) - return PyUnicode_FromUnicode(NULL, 0); + return PyUnicode_New(0, 0); buf.outobj = buf.excobj = NULL; cres = NULL; diff --git a/Objects/stringlib/unicode_format.h b/Objects/stringlib/unicode_format.h --- a/Objects/stringlib/unicode_format.h +++ b/Objects/stringlib/unicode_format.h @@ -79,7 +79,7 @@ SubString_new_object_or_empty(SubString *str) { if (str->str == NULL) { - return PyUnicode_FromUnicode(NULL, 0); + return PyUnicode_New(0, 0); } return SubString_new_object(str); } -- Repository URL: http://hg.python.org/cpython

1 0

cpython: MultibyteCodec_Decode() catchs PyUnicode_AS_UNICODE() failures
by victor.stinner Dec. 1, 2011

Dec. 1, 2011

http://hg.python.org/cpython/rev/7216cf767993 changeset: 73802:7216cf767993 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Dec 01 03:18:30 2011 +0100 summary: MultibyteCodec_Decode() catchs PyUnicode_AS_UNICODE() failures files: Modules/cjkcodecs/multibytecodec.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -643,6 +643,8 @@ if (buf.outobj == NULL) goto errorexit; buf.outbuf = PyUnicode_AS_UNICODE(buf.outobj); + if (buf.outbuf == NULL) + goto errorexit; buf.outbuf_end = buf.outbuf + PyUnicode_GET_SIZE(buf.outobj); if (self->codec->decinit != NULL && -- Repository URL: http://hg.python.org/cpython

1 0

cpython: PyCodec_IgnoreErrors() avoids the deprecated "u#" format
by victor.stinner Dec. 1, 2011

Dec. 1, 2011

http://hg.python.org/cpython/rev/6407294eb3c6 changeset: 73800:6407294eb3c6 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Dec 01 02:52:11 2011 +0100 summary: PyCodec_IgnoreErrors() avoids the deprecated "u#" format files: Python/codecs.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Python/codecs.c b/Python/codecs.c --- a/Python/codecs.c +++ b/Python/codecs.c @@ -510,8 +510,7 @@ wrong_exception_type(exc); return NULL; } - /* ouch: passing NULL, 0, pos gives None instead of u'' */ - return Py_BuildValue("(u#n)", &end, 0, end); + return Py_BuildValue("(Nn)", PyUnicode_New(0, 0), end); } -- Repository URL: http://hg.python.org/cpython

1 0

cpython: c-api: Replace PyUnicodeObject* by PyObject* in "U" format doc
by victor.stinner Dec. 1, 2011

Dec. 1, 2011

http://hg.python.org/cpython/rev/ba8e7886fdd7 changeset: 73801:ba8e7886fdd7 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Dec 01 02:52:55 2011 +0100 summary: c-api: Replace PyUnicodeObject* by PyObject* in "U" format doc files: Doc/c-api/arg.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -146,7 +146,7 @@ Like ``u#``, but the Python object may also be ``None``, in which case the :c:type:`Py_UNICODE` pointer is set to *NULL*. -``U`` (:class:`str`) [PyUnicodeObject \*] +``U`` (:class:`str`) [PyObject \*] Requires that the Python object is a Unicode object, without attempting any conversion. Raises :exc:`TypeError` if the object is not a Unicode object. The C variable may also be declared as :c:type:`PyObject\*`. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: PyObject_Repr() ensures that the result is a ready Unicode string
by victor.stinner Dec. 1, 2011

Dec. 1, 2011

http://hg.python.org/cpython/rev/c5d2ce38b0d3 changeset: 73799:c5d2ce38b0d3 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Dec 01 02:15:00 2011 +0100 summary: PyObject_Repr() ensures that the result is a ready Unicode string And PyObject_Str() and PyObject_Repr() don't make strings ready in debug mode to ensure that the caller makes the string ready before using it. files: Objects/object.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -385,6 +385,10 @@ Py_DECREF(res); return NULL; } +#ifndef Py_DEBUG + if (PyUnicode_READY(res) < 0) + return NULL; +#endif return res; } @@ -403,8 +407,10 @@ if (v == NULL) return PyUnicode_FromString("<NULL>"); if (PyUnicode_CheckExact(v)) { +#ifndef Py_DEBUG if (PyUnicode_READY(v) < 0) return NULL; +#endif Py_INCREF(v); return v; } @@ -426,8 +432,10 @@ Py_DECREF(res); return NULL; } +#ifndef Py_DEBUG if (PyUnicode_READY(res) < 0) return NULL; +#endif assert(_PyUnicode_CheckConsistency(res, 1)); return res; } -- Repository URL: http://hg.python.org/cpython

1 0