Mailman 3 April 2015 - Python-checkins

cpython (merge 3.4 -> default): Merge 3.4
by andrew.svetlov 27 Apr '15

27 Apr '15

https://hg.python.org/cpython/rev/4803a6d569f7 changeset: 95820:4803a6d569f7 parent: 95818:18882c93f4bd parent: 95819:69951573cb0e user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Mon Apr 27 17:49:16 2015 +0300 summary: Merge 3.4 files: Misc/NEWS | 2 ++ Objects/methodobject.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -89,6 +89,8 @@ - Issue #24044: Fix possible null pointer dereference in list.sort in out of memory conditions. +- Issue #21354: PyCFunction_New function is exposed by python DLL again. + Library ------- diff --git a/Objects/methodobject.c b/Objects/methodobject.c --- a/Objects/methodobject.c +++ b/Objects/methodobject.c @@ -16,7 +16,7 @@ /* undefine macro trampoline to PyCFunction_NewEx */ #undef PyCFunction_New -PyObject * +PyAPI_FUNC(PyObject *) PyCFunction_New(PyMethodDef *ml, PyObject *self) { return PyCFunction_NewEx(ml, self, NULL); -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Issue #24062: Fix os.stat links. Patch by July Tikhonov.
by berker.peksag 27 Apr '15

27 Apr '15

https://hg.python.org/cpython/rev/5850f0c17c34 changeset: 95817:5850f0c17c34 branch: 3.4 parent: 95813:ec6ed10d611e user: Berker Peksag <berker.peksag(a)gmail.com> date: Mon Apr 27 13:53:28 2015 +0300 summary: Issue #24062: Fix os.stat links. Patch by July Tikhonov. files: Doc/library/os.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -772,7 +772,7 @@ .. seealso:: - The :func:`stat` function. + The :func:`.stat` function. Availability: Unix, Windows. @@ -1601,7 +1601,7 @@ .. seealso:: - The :func:`stat` function. + The :func:`.stat` function. .. versionchanged:: 3.2 Added support for Windows 6.0 (Vista) symbolic links. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): Issue #24062: Fix os.stat links. Patch by July Tikhonov.
by berker.peksag 27 Apr '15

27 Apr '15

https://hg.python.org/cpython/rev/18882c93f4bd changeset: 95818:18882c93f4bd parent: 95815:cb4334ab8453 parent: 95817:5850f0c17c34 user: Berker Peksag <berker.peksag(a)gmail.com> date: Mon Apr 27 13:53:54 2015 +0300 summary: Issue #24062: Fix os.stat links. Patch by July Tikhonov. files: Doc/library/os.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/os.rst b/Doc/library/os.rst --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -773,7 +773,7 @@ .. seealso:: - The :func:`stat` function. + The :func:`.stat` function. Availability: Unix, Windows. @@ -1647,7 +1647,7 @@ .. seealso:: - The :func:`stat` function. + The :func:`.stat` function. .. versionchanged:: 3.2 Added support for Windows 6.0 (Vista) symbolic links. -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (cb4334ab8453): sum=3
by solipsis＠pitrou.net 27 Apr '15

27 Apr '15

results for cb4334ab8453 on branch "default" -------------------------------------------- test_functools leaked [0, 0, 3] memory blocks, sum=3 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogGZTLLb', '--timeout', '7200']

1 0

cpython (2.7): allow 2.7 to be built with asan (closes #24061)
by benjamin.peterson 27 Apr '15

27 Apr '15

https://hg.python.org/cpython/rev/4234b0dd2a54 changeset: 95816:4234b0dd2a54 branch: 2.7 parent: 95814:192f9efe4a38 user: Benjamin Peterson <benjamin(a)python.org> date: Sun Apr 26 20:33:38 2015 -0400 summary: allow 2.7 to be built with asan (closes #24061) files: Objects/obmalloc.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c --- a/Objects/obmalloc.c +++ b/Objects/obmalloc.c @@ -1,5 +1,23 @@ #include "Python.h" +#if defined(__has_feature) /* Clang */ + #if __has_feature(address_sanitizer) /* is ASAN enabled? */ + #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS \ + __attribute__((no_address_safety_analysis)) \ + __attribute__ ((noinline)) + #else + #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS + #endif +#else + #if defined(__SANITIZE_ADDRESS__) /* GCC 4.8.x, is ASAN enabled? */ + #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS \ + __attribute__((no_address_safety_analysis)) \ + __attribute__ ((noinline)) + #else + #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS + #endif +#endif + #ifdef WITH_PYMALLOC #ifdef HAVE_MMAP @@ -971,6 +989,7 @@ /* free */ #undef PyObject_Free +ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS void PyObject_Free(void *p) { @@ -1201,6 +1220,7 @@ */ #undef PyObject_Realloc +ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS void * PyObject_Realloc(void *p, size_t nbytes) { -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): merge 3.4 (#24058)
by benjamin.peterson 26 Apr '15

26 Apr '15

https://hg.python.org/cpython/rev/cb4334ab8453 changeset: 95815:cb4334ab8453 parent: 95812:a6140242b79f parent: 95813:ec6ed10d611e user: Benjamin Peterson <benjamin(a)python.org> date: Sun Apr 26 15:56:23 2015 -0400 summary: merge 3.4 (#24058) files: Modules/readline.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Modules/readline.c b/Modules/readline.c --- a/Modules/readline.c +++ b/Modules/readline.c @@ -1103,8 +1103,6 @@ rl_callback_handler_remove(); } -extern PyThreadState* _PyOS_ReadlineTState; - static char * readline_until_enter_or_signal(const char *prompt, int *signal) { -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): remove extern definition, since it's in a header file (closes #24058)
by benjamin.peterson 26 Apr '15

26 Apr '15

https://hg.python.org/cpython/rev/ec6ed10d611e changeset: 95813:ec6ed10d611e branch: 3.4 parent: 95810:15c80f63ea1c user: Benjamin Peterson <benjamin(a)python.org> date: Sun Apr 26 15:55:06 2015 -0400 summary: remove extern definition, since it's in a header file (closes #24058) files: Modules/readline.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Modules/readline.c b/Modules/readline.c --- a/Modules/readline.c +++ b/Modules/readline.c @@ -1062,8 +1062,6 @@ rl_callback_handler_remove(); } -extern PyThreadState* _PyOS_ReadlineTState; - static char * readline_until_enter_or_signal(const char *prompt, int *signal) { -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): remove extern definition, since it's in a header file (closes #24058)
by benjamin.peterson 26 Apr '15

26 Apr '15

https://hg.python.org/cpython/rev/192f9efe4a38 changeset: 95814:192f9efe4a38 branch: 2.7 parent: 95809:050e0c0b3d90 user: Benjamin Peterson <benjamin(a)python.org> date: Sun Apr 26 15:55:06 2015 -0400 summary: remove extern definition, since it's in a header file (closes #24058) files: Modules/readline.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Modules/readline.c b/Modules/readline.c --- a/Modules/readline.c +++ b/Modules/readline.c @@ -975,8 +975,6 @@ rl_callback_handler_remove(); } -extern PyThreadState* _PyOS_ReadlineTState; - static char * readline_until_enter_or_signal(char *prompt, int *signal) { -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Add missing newline in NEWS
by antoine.pitrou 26 Apr '15

26 Apr '15

https://hg.python.org/cpython/rev/a6140242b79f changeset: 95812:a6140242b79f user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Apr 26 18:48:28 2015 +0200 summary: Add missing newline in NEWS files: Misc/NEWS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -14,6 +14,7 @@ unnormalized StopIteration exception. Patch by Stefan Behnel. - Issue #24022: Fix tokenizer crash when processing undecodable source code. + - Issue #9951: Added a hex() method to bytes, bytearray, and memoryview. Library -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): Issue #23996: Avoid a crash when a delegated generator raises an unnormalized
by antoine.pitrou 26 Apr '15

26 Apr '15

https://hg.python.org/cpython/rev/9d0c6c66b0ac changeset: 95811:9d0c6c66b0ac parent: 95808:2d3ed019bc9f parent: 95810:15c80f63ea1c user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Apr 26 18:48:16 2015 +0200 summary: Issue #23996: Avoid a crash when a delegated generator raises an unnormalized StopIteration exception. Patch by Stefan Behnel. files: Misc/NEWS | 3 +++ Objects/genobject.c | 27 ++++++++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #23996: Avoid a crash when a delegated generator raises an + unnormalized StopIteration exception. Patch by Stefan Behnel. + - Issue #24022: Fix tokenizer crash when processing undecodable source code. - Issue #9951: Added a hex() method to bytes, bytearray, and memoryview. diff --git a/Objects/genobject.c b/Objects/genobject.c --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -396,13 +396,30 @@ if (PyErr_ExceptionMatches(PyExc_StopIteration)) { PyErr_Fetch(&et, &ev, &tb); + if (ev) { + /* exception will usually be normalised already */ + if (Py_TYPE(ev) == (PyTypeObject *) et + || PyObject_IsInstance(ev, PyExc_StopIteration)) { + value = ((PyStopIterationObject *)ev)->value; + Py_INCREF(value); + Py_DECREF(ev); + } else if (et == PyExc_StopIteration) { + /* avoid normalisation and take ev as value */ + value = ev; + } else { + /* normalisation required */ + PyErr_NormalizeException(&et, &ev, &tb); + if (!PyObject_IsInstance(ev, PyExc_StopIteration)) { + PyErr_Restore(et, ev, tb); + return -1; + } + value = ((PyStopIterationObject *)ev)->value; + Py_INCREF(value); + Py_DECREF(ev); + } + } Py_XDECREF(et); Py_XDECREF(tb); - if (ev) { - value = ((PyStopIterationObject *)ev)->value; - Py_INCREF(value); - Py_DECREF(ev); - } } else if (PyErr_Occurred()) { return -1; } -- Repository URL: https://hg.python.org/cpython

1 0