Mailman 3 January 2012 - Python-checkins

cpython (3.2): ready types returned from PyType_FromSpec
by benjamin.peterson Jan. 30, 2012

Jan. 30, 2012

http://hg.python.org/cpython/rev/e858bb04f7e7 changeset: 74685:e858bb04f7e7 branch: 3.2 user: Benjamin Peterson <benjamin(a)python.org> date: Sun Jan 29 20:16:37 2012 -0500 summary: ready types returned from PyType_FromSpec files: Misc/NEWS | 2 ++ Objects/typeobject.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,8 @@ Core and Builtins ----------------- +- Issue #13908: Ready types returned from PyType_FromSpec. + - Issue #11235: Fix OverflowError when trying to import a source file whose modification time doesn't fit in a 32-bit timestamp. diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2386,6 +2386,9 @@ } } + if (PyType_Ready(&res->ht_type) < 0) + goto fail; + return (PyObject*)res; fail: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): adjust declaration
by benjamin.peterson Jan. 30, 2012

Jan. 30, 2012

http://hg.python.org/cpython/rev/32816454ba30 changeset: 74684:32816454ba30 branch: 3.2 parent: 74680:572bb8c265c0 user: Benjamin Peterson <benjamin(a)python.org> date: Sun Jan 29 20:13:18 2012 -0500 summary: adjust declaration files: Objects/typeobject.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2347,7 +2347,8 @@ #include "typeslots.inc" }; -PyObject* PyType_FromSpec(PyType_Spec *spec) +PyObject * +PyType_FromSpec(PyType_Spec *spec) { PyHeapTypeObject *res = (PyHeapTypeObject*)PyType_GenericAlloc(&PyType_Type, 0); char *res_start = (char*)res; -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #13847: Fix test_time, time.gmtime() doesn't use localtime()
by victor.stinner Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/cpython/rev/5b42aefb8969 changeset: 74683:5b42aefb8969 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Mon Jan 30 00:23:32 2012 +0100 summary: Issue #13847: Fix test_time, time.gmtime() doesn't use localtime() On Windows, localtime(-1) fails, but not gmtime(1). files: Lib/test/test_time.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -361,7 +361,6 @@ self.skipTest("unable to find an invalid time_t value") self.assertRaises(OSError, time.localtime, invalid_time_t) - self.assertRaises(OSError, time.gmtime, invalid_time_t) self.assertRaises(OSError, time.ctime, invalid_time_t) class TestLocale(unittest.TestCase): -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #13874: read_null() of faulthandler uses volatile to avoid optimisation
by victor.stinner Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/cpython/rev/f71249d785d6 changeset: 74682:f71249d785d6 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Mon Jan 30 00:07:43 2012 +0100 summary: Issue #13874: read_null() of faulthandler uses volatile to avoid optimisation Clang 3.0 removes "y = *x;" instruction if the optimisation level is 3. files: Modules/faulthandler.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -943,10 +943,13 @@ static PyObject * faulthandler_read_null(PyObject *self, PyObject *args) { - int *x = NULL, y; + volatile int *x; + volatile int y; int release_gil = 0; if (!PyArg_ParseTuple(args, "|i:_read_null", &release_gil)) return NULL; + + x = NULL; if (release_gil) { Py_BEGIN_ALLOW_THREADS y = *x; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #13848: open() and the FileIO constructor now check for NUL characters in
by antoine.pitrou Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/cpython/rev/6bb05ce1cd1f changeset: 74681:6bb05ce1cd1f parent: 74679:9be82f458b79 parent: 74680:572bb8c265c0 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Jan 29 18:43:36 2012 +0100 summary: Issue #13848: open() and the FileIO constructor now check for NUL characters in the file name. Patch by Hynek Schlawack. files: Include/unicodeobject.h | 6 +++++ Lib/test/test_fileio.py | 5 ++++ Lib/test/test_io.py | 5 ++++ Misc/NEWS | 3 ++ Modules/_io/fileio.c | 30 ++++++++-------------------- Objects/unicodeobject.c | 13 ++++++++++++ 6 files changed, 41 insertions(+), 21 deletions(-) diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -1914,6 +1914,12 @@ PyObject *element /* Element string */ ); +/* Checks whether the string contains any NUL characters. */ + +#ifndef Py_LIMITED_API +PyAPI_FUNC(int) _PyUnicode_HasNULChars(PyObject *); +#endif + /* Checks whether argument is a valid identifier. */ PyAPI_FUNC(int) PyUnicode_IsIdentifier(PyObject *s); diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -306,6 +306,11 @@ finally: os.unlink(TESTFN) + def testConstructorHandlesNULChars(self): + fn_with_NUL = 'foo\0bar' + self.assertRaises(TypeError, _FileIO, fn_with_NUL, 'w') + self.assertRaises(TypeError, _FileIO, bytes(fn_with_NUL, 'ascii'), 'w') + def testInvalidFd(self): self.assertRaises(ValueError, _FileIO, -10) self.assertRaises(OSError, _FileIO, make_bad_fd()) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -363,6 +363,11 @@ self.assertRaises(exc, fp.seek, 1, self.SEEK_CUR) self.assertRaises(exc, fp.seek, -1, self.SEEK_END) + def test_open_handles_NUL_chars(self): + fn_with_NUL = 'foo\0bar' + self.assertRaises(TypeError, self.open, fn_with_NUL, 'w') + self.assertRaises(TypeError, self.open, bytes(fn_with_NUL, 'ascii'), 'w') + def test_raw_file_io(self): with self.open(support.TESTFN, "wb", buffering=0) as f: self.assertEqual(f.readable(), False) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -461,6 +461,9 @@ Library ------- +- Issue #13848: open() and the FileIO constructor now check for NUL + characters in the file name. Patch by Hynek Schlawack. + - Issue #13806: The size check in audioop decompression functions was too strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk. diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -258,6 +258,12 @@ #ifdef MS_WINDOWS if (PyUnicode_Check(nameobj)) { + int rv = _PyUnicode_HasNULChars(nameobj); + if (rv) { + if (rv != -1) + PyErr_SetString(PyExc_TypeError, "embedded NUL character"); + return -1; + } widename = PyUnicode_AsUnicode(nameobj); if (widename == NULL) return -1; @@ -265,28 +271,10 @@ #endif if (fd < 0) { - if (PyBytes_Check(nameobj) || PyByteArray_Check(nameobj)) { - Py_ssize_t namelen; - if (PyObject_AsCharBuffer(nameobj, &name, &namelen) < 0) - return -1; + if (!PyUnicode_FSConverter(nameobj, &stringobj)) { + return -1; } - else { - PyObject *u = PyUnicode_FromObject(nameobj); - - if (u == NULL) - return -1; - - stringobj = PyUnicode_EncodeFSDefault(u); - Py_DECREF(u); - if (stringobj == NULL) - return -1; - if (!PyBytes_Check(stringobj)) { - PyErr_SetString(PyExc_TypeError, - "encoder failed to return bytes"); - goto error; - } - name = PyBytes_AS_STRING(stringobj); - } + name = PyBytes_AS_STRING(stringobj); } s = mode; diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -3575,6 +3575,19 @@ int +_PyUnicode_HasNULChars(PyObject* s) +{ + static PyObject *nul = NULL; + + if (nul == NULL) + nul = PyUnicode_FromStringAndSize("\0", 1); + if (nul == NULL) + return -1; + return PyUnicode_Contains(s, nul); +} + + +int PyUnicode_FSConverter(PyObject* arg, void* addr) { PyObject *output = NULL; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #13848: open() and the FileIO constructor now check for NUL characters in
by antoine.pitrou Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/cpython/rev/572bb8c265c0 changeset: 74680:572bb8c265c0 branch: 3.2 parent: 74676:0d5667171356 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Jan 29 18:36:34 2012 +0100 summary: Issue #13848: open() and the FileIO constructor now check for NUL characters in the file name. Patch by Hynek Schlawack. files: Include/unicodeobject.h | 6 +++++ Lib/test/test_fileio.py | 5 ++++ Lib/test/test_io.py | 5 ++++ Misc/ACKS | 1 + Misc/NEWS | 3 ++ Modules/_io/fileio.c | 33 +++++++++------------------- Objects/unicodeobject.c | 13 +++++++++++ 7 files changed, 44 insertions(+), 22 deletions(-) diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -1501,6 +1501,12 @@ PyObject *element /* Element string */ ); +/* Checks whether the string contains any NUL characters. */ + +#ifndef Py_LIMITED_API +PyAPI_FUNC(int) _PyUnicode_HasNULChars(PyObject *); +#endif + /* Checks whether argument is a valid identifier. */ PyAPI_FUNC(int) PyUnicode_IsIdentifier(PyObject *s); diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -305,6 +305,11 @@ finally: os.unlink(TESTFN) + def testConstructorHandlesNULChars(self): + fn_with_NUL = 'foo\0bar' + self.assertRaises(TypeError, _FileIO, fn_with_NUL, 'w') + self.assertRaises(TypeError, _FileIO, bytes(fn_with_NUL, 'ascii'), 'w') + def testInvalidFd(self): self.assertRaises(ValueError, _FileIO, -10) self.assertRaises(OSError, _FileIO, make_bad_fd()) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -363,6 +363,11 @@ self.assertRaises(exc, fp.seek, 1, self.SEEK_CUR) self.assertRaises(exc, fp.seek, -1, self.SEEK_END) + def test_open_handles_NUL_chars(self): + fn_with_NUL = 'foo\0bar' + self.assertRaises(TypeError, self.open, fn_with_NUL, 'w') + self.assertRaises(TypeError, self.open, bytes(fn_with_NUL, 'ascii'), 'w') + def test_raw_file_io(self): with self.open(support.TESTFN, "wb", buffering=0) as f: self.assertEqual(f.readable(), False) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -811,6 +811,7 @@ Andreas Schawo Neil Schemenauer David Scherer +Hynek Schlawack Bob Schmertz Gregor Schmid Ralf Schmitt diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -111,6 +111,9 @@ Library ------- +- Issue #13848: open() and the FileIO constructor now check for NUL + characters in the file name. Patch by Hynek Schlawack. + - Issue #13806: The size check in audioop decompression functions was too strict and could reject valid compressed data. Patch by Oleg Plakhotnyuk. diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -253,34 +253,23 @@ } #ifdef MS_WINDOWS - if (PyUnicode_Check(nameobj)) + if (PyUnicode_Check(nameobj)) { + int rv = _PyUnicode_HasNULChars(nameobj); + if (rv) { + if (rv != -1) + PyErr_SetString(PyExc_TypeError, "embedded NUL character"); + return -1; + } widename = PyUnicode_AS_UNICODE(nameobj); + } if (widename == NULL) #endif if (fd < 0) { - if (PyBytes_Check(nameobj) || PyByteArray_Check(nameobj)) { - Py_ssize_t namelen; - if (PyObject_AsCharBuffer(nameobj, &name, &namelen) < 0) - return -1; + if (!PyUnicode_FSConverter(nameobj, &stringobj)) { + return -1; } - else { - PyObject *u = PyUnicode_FromObject(nameobj); - - if (u == NULL) - return -1; - - stringobj = PyUnicode_EncodeFSDefault(u); - Py_DECREF(u); - if (stringobj == NULL) - return -1; - if (!PyBytes_Check(stringobj)) { - PyErr_SetString(PyExc_TypeError, - "encoder failed to return bytes"); - goto error; - } - name = PyBytes_AS_STRING(stringobj); - } + name = PyBytes_AS_STRING(stringobj); } s = mode; diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1867,6 +1867,19 @@ int +_PyUnicode_HasNULChars(PyObject* s) +{ + static PyObject *nul = NULL; + + if (nul == NULL) + nul = PyUnicode_FromStringAndSize("\0", 1); + if (nul == NULL) + return -1; + return PyUnicode_Contains(s, nul); +} + + +int PyUnicode_FSConverter(PyObject* arg, void* addr) { PyObject *output = NULL; -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #6774: Back out c8b77efe8b56, which only brings confusion.
by charles-francois.natali Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/cpython/rev/9be82f458b79 changeset: 74679:9be82f458b79 parent: 74677:a273f6e101c6 user: Charles-François Natali <neologix(a)free.fr> date: Sun Jan 29 16:42:54 2012 +0100 summary: Issue #6774: Back out c8b77efe8b56, which only brings confusion. files: Doc/library/socket.rst | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -1071,9 +1071,7 @@ Shut down one or both halves of the connection. If *how* is :const:`SHUT_RD`, further receives are disallowed. If *how* is :const:`SHUT_WR`, further sends are disallowed. If *how* is :const:`SHUT_RDWR`, further sends and receives are - disallowed. Depending on the platform, shutting down one half of the connection - can also close the opposite half (e.g. on Mac OS X, ``shutdown(SHUT_WR)`` does - not allow further reads on the other end of the connection). + disallowed. Note that there are no methods :meth:`read` or :meth:`write`; use :meth:`~socket.recv` and :meth:`~socket.send` without *flags* argument instead. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Fix #13900: resolve self-referential description of a parameter.
by georg.brandl Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/cpython/rev/690d5978bd21 changeset: 74678:690d5978bd21 branch: 2.7 parent: 74675:4c6662090870 user: Georg Brandl <georg(a)python.org> date: Sun Jan 29 15:38:47 2012 +0100 summary: Fix #13900: resolve self-referential description of a parameter. files: Doc/library/email.parser.rst | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/library/email.parser.rst b/Doc/library/email.parser.rst --- a/Doc/library/email.parser.rst +++ b/Doc/library/email.parser.rst @@ -135,7 +135,9 @@ data or by a blank line. Following the header block is the body of the message (which may contain MIME-encoded subparts). - Optional *headersonly* is as with the :meth:`parse` method. + Optional *headersonly* is a flag specifying whether to stop parsing after + reading the headers or not. The default is ``False``, meaning it parses + the entire contents of the file. .. versionchanged:: 2.2.2 The *headersonly* flag was added. @@ -148,9 +150,7 @@ equivalent to wrapping *text* in a :class:`StringIO` instance first and calling :meth:`parse`. - Optional *headersonly* is a flag specifying whether to stop parsing after - reading the headers or not. The default is ``False``, meaning it parses - the entire contents of the file. + Optional *headersonly* is as with the :meth:`parse` method. .. versionchanged:: 2.2.2 The *headersonly* flag was added. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): merge with 3.2
by georg.brandl Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/cpython/rev/a273f6e101c6 changeset: 74677:a273f6e101c6 parent: 74674:aa214fefbdc1 parent: 74676:0d5667171356 user: Georg Brandl <georg(a)python.org> date: Sun Jan 29 15:38:55 2012 +0100 summary: merge with 3.2 files: Doc/library/email.parser.rst | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/library/email.parser.rst b/Doc/library/email.parser.rst --- a/Doc/library/email.parser.rst +++ b/Doc/library/email.parser.rst @@ -141,7 +141,9 @@ data or by a blank line. Following the header block is the body of the message (which may contain MIME-encoded subparts). - Optional *headersonly* is as with the :meth:`parse` method. + Optional *headersonly* is a flag specifying whether to stop parsing after + reading the headers or not. The default is ``False``, meaning it parses + the entire contents of the file. .. method:: parsestr(text, headersonly=False) @@ -150,9 +152,7 @@ equivalent to wrapping *text* in a :class:`~io.StringIO` instance first and calling :meth:`parse`. - Optional *headersonly* is a flag specifying whether to stop parsing after - reading the headers or not. The default is ``False``, meaning it parses - the entire contents of the file. + Optional *headersonly* is as with the :meth:`parse` method. .. class:: BytesParser(_class=email.message.Message, *, policy=policy.default) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Fix #13900: resolve self-referential description of a parameter.
by georg.brandl Jan. 29, 2012

Jan. 29, 2012

http://hg.python.org/cpython/rev/0d5667171356 changeset: 74676:0d5667171356 branch: 3.2 parent: 74673:4084b2c65dca user: Georg Brandl <georg(a)python.org> date: Sun Jan 29 15:38:47 2012 +0100 summary: Fix #13900: resolve self-referential description of a parameter. files: Doc/library/email.parser.rst | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/library/email.parser.rst b/Doc/library/email.parser.rst --- a/Doc/library/email.parser.rst +++ b/Doc/library/email.parser.rst @@ -133,7 +133,9 @@ data or by a blank line. Following the header block is the body of the message (which may contain MIME-encoded subparts). - Optional *headersonly* is as with the :meth:`parse` method. + Optional *headersonly* is a flag specifying whether to stop parsing after + reading the headers or not. The default is ``False``, meaning it parses + the entire contents of the file. .. method:: parsestr(text, headersonly=False) @@ -142,9 +144,7 @@ equivalent to wrapping *text* in a :class:`~io.StringIO` instance first and calling :meth:`parse`. - Optional *headersonly* is a flag specifying whether to stop parsing after - reading the headers or not. The default is ``False``, meaning it parses - the entire contents of the file. + Optional *headersonly* is as with the :meth:`parse` method. .. class:: BytesParser(_class=email.message.Message, strict=None) -- Repository URL: http://hg.python.org/cpython

1 0