Mailman 3 August 2013 - Python-checkins

cpython (merge 3.3 -> default): Issue #17557: merge from 3.3
by ned.deily Aug. 2, 2013

Aug. 2, 2013

http://hg.python.org/cpython/rev/634a8e8816d4 changeset: 84970:634a8e8816d4 parent: 84966:e51cbc45f4ca parent: 84969:0a4afa8833b5 user: Ned Deily <nad(a)acm.org> date: Thu Aug 01 21:37:17 2013 -0700 summary: Issue #17557: merge from 3.3 files: Misc/ACKS | 1 + Misc/NEWS | 3 +++ Modules/posixmodule.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -737,6 +737,7 @@ Luke Kenneth Casson Leighton Tshepang Lekhonkhobe Marc-André Lemburg +Mateusz Lenik John Lenton Kostyantyn Leschenko Benno Leslie diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -184,6 +184,9 @@ Library ------- +- Issue #17557: Fix os.getgroups() to work with the modified behavior of + getgroups(2) on OS X 10.8. Original patch by Mateusz Lenik. + - Issue #18608: Avoid keeping a strong reference to the locale module inside the _io module. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -5911,6 +5911,34 @@ gid_t* alt_grouplist = grouplist; int n; +#ifdef __APPLE__ + /* Issue #17557: As of OS X 10.8, getgroups(2) no longer raises EINVAL if + * there are more groups than can fit in grouplist. Therefore, on OS X + * always first call getgroups with length 0 to get the actual number + * of groups. + */ + n = getgroups(0, NULL); + if (n < 0) { + return posix_error(); + } else if (n <= MAX_GROUPS) { + /* groups will fit in existing array */ + alt_grouplist = grouplist; + } else { + alt_grouplist = PyMem_Malloc(n * sizeof(gid_t)); + if (alt_grouplist == NULL) { + errno = EINVAL; + return posix_error(); + } + } + + n = getgroups(n, alt_grouplist); + if (n == -1) { + if (alt_grouplist != grouplist) { + PyMem_Free(alt_grouplist); + } + return posix_error(); + } +#else n = getgroups(MAX_GROUPS, grouplist); if (n < 0) { if (errno == EINVAL) { @@ -5937,6 +5965,8 @@ return posix_error(); } } +#endif + result = PyList_New(n); if (result != NULL) { int i; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #17557: Fix os.getgroups() to work with the modified behavior of
by ned.deily Aug. 2, 2013

Aug. 2, 2013

http://hg.python.org/cpython/rev/0a4afa8833b5 changeset: 84969:0a4afa8833b5 branch: 3.3 parent: 84967:bf68711bc939 user: Ned Deily <nad(a)acm.org> date: Thu Aug 01 21:21:15 2013 -0700 summary: Issue #17557: Fix os.getgroups() to work with the modified behavior of getgroups(2) on OS X 10.8. Original patch by Mateusz Lenik. files: Misc/ACKS | 1 + Misc/NEWS | 3 +++ Modules/posixmodule.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -721,6 +721,7 @@ Luke Kenneth Casson Leighton Tshepang Lekhonkhobe Marc-André Lemburg +Mateusz Lenik John Lenton Kostyantyn Leschenko Christopher Tur Lesniewski-Laas diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -59,6 +59,9 @@ Library ------- +- Issue #17557: Fix os.getgroups() to work with the modified behavior of + getgroups(2) on OS X 10.8. Original patch by Mateusz Lenik. + - Issue #18599: Fix name attribute of _sha1.sha1() object. It now returns 'SHA1' instead of 'SHA'. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -6331,6 +6331,34 @@ gid_t* alt_grouplist = grouplist; int n; +#ifdef __APPLE__ + /* Issue #17557: As of OS X 10.8, getgroups(2) no longer raises EINVAL if + * there are more groups than can fit in grouplist. Therefore, on OS X + * always first call getgroups with length 0 to get the actual number + * of groups. + */ + n = getgroups(0, NULL); + if (n < 0) { + return posix_error(); + } else if (n <= MAX_GROUPS) { + /* groups will fit in existing array */ + alt_grouplist = grouplist; + } else { + alt_grouplist = PyMem_Malloc(n * sizeof(gid_t)); + if (alt_grouplist == NULL) { + errno = EINVAL; + return posix_error(); + } + } + + n = getgroups(n, alt_grouplist); + if (n == -1) { + if (alt_grouplist != grouplist) { + PyMem_Free(alt_grouplist); + } + return posix_error(); + } +#else n = getgroups(MAX_GROUPS, grouplist); if (n < 0) { if (errno == EINVAL) { @@ -6357,6 +6385,8 @@ return posix_error(); } } +#endif + result = PyList_New(n); if (result != NULL) { int i; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #17557: Fix os.getgroups() to work with the modified behavior of
by ned.deily Aug. 2, 2013

Aug. 2, 2013

http://hg.python.org/cpython/rev/6d3b7e0559a0 changeset: 84968:6d3b7e0559a0 branch: 2.7 parent: 84961:3bd55ec317a7 user: Ned Deily <nad(a)acm.org> date: Thu Aug 01 21:19:09 2013 -0700 summary: Issue #17557: Fix os.getgroups() to work with the modified behavior of getgroups(2) on OS X 10.8. Original patch by Mateusz Lenik. files: Misc/ACKS | 1 + Misc/NEWS | 3 +++ Modules/posixmodule.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -599,6 +599,7 @@ Luke Kenneth Casson Leighton Tshepang Lekhonkhobe Marc-André Lemburg +Mateusz Lenik John Lenton Kostyantyn Leschenko Christopher Tur Lesniewski-Laas diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -26,6 +26,9 @@ Library ------- +- Issue #17557: Fix os.getgroups() to work with the modified behavior of + getgroups(2) on OS X 10.8. Original patch by Mateusz Lenik. + - Issue #18455: multiprocessing should not retry connect() with same socket. - Issue #18513: Fix behaviour of cmath.rect w.r.t. signed zeros on OS X 10.8 + diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -4054,6 +4054,34 @@ gid_t* alt_grouplist = grouplist; int n; +#ifdef __APPLE__ + /* Issue #17557: As of OS X 10.8, getgroups(2) no longer raises EINVAL if + * there are more groups than can fit in grouplist. Therefore, on OS X + * always first call getgroups with length 0 to get the actual number + * of groups. + */ + n = getgroups(0, NULL); + if (n < 0) { + return posix_error(); + } else if (n <= MAX_GROUPS) { + /* groups will fit in existing array */ + alt_grouplist = grouplist; + } else { + alt_grouplist = PyMem_Malloc(n * sizeof(gid_t)); + if (alt_grouplist == NULL) { + errno = EINVAL; + return posix_error(); + } + } + + n = getgroups(n, alt_grouplist); + if (n == -1) { + if (alt_grouplist != grouplist) { + PyMem_Free(alt_grouplist); + } + return posix_error(); + } +#else n = getgroups(MAX_GROUPS, grouplist); if (n < 0) { if (errno == EINVAL) { @@ -4080,6 +4108,8 @@ return posix_error(); } } +#endif + result = PyList_New(n); if (result != NULL) { int i; -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (e51cbc45f4ca): sum=0
by solipsis＠pitrou.net Aug. 2, 2013

Aug. 2, 2013

results for e51cbc45f4ca on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogqHM7qL', '-x']

1 0

cpython (3.3): Issue #17899: Fix rare file descriptor leak in os.listdir().
by larry.hastings Aug. 2, 2013

Aug. 2, 2013

http://hg.python.org/cpython/rev/bf68711bc939 changeset: 84967:bf68711bc939 branch: 3.3 parent: 84955:a381721299a3 user: Larry Hastings <larry(a)hastings.org> date: Thu Aug 01 19:34:46 2013 -0700 summary: Issue #17899: Fix rare file descriptor leak in os.listdir(). (Done as separate patch from trunk as the code has diverged quite a bit.) files: Misc/NEWS | 2 ++ Modules/posixmodule.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,8 @@ Core and Builtins ----------------- +- Issue #17899: Fix rare file descriptor leak in os.listdir(). + - Issue #18552: Check return value of PyArena_AddPyObject() in obj2ast_object(). diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -3443,7 +3443,9 @@ path_t path; PyObject *list = NULL; static char *keywords[] = {"path", NULL}; +#ifdef HAVE_FDOPENDIR int fd = -1; +#endif /* HAVE_FDOPENDIR */ #if defined(MS_WINDOWS) && !defined(HAVE_OPENDIR) PyObject *v; @@ -3732,6 +3734,13 @@ if (dirp == NULL) { list = path_error("listdir", &path); +#ifdef HAVE_FDOPENDIR + if (fd != -1) { + Py_BEGIN_ALLOW_THREADS + close(fd); + Py_END_ALLOW_THREADS + } +#endif /* HAVE_FDOPENDIR */ goto exit; } if ((list = PyList_New(0)) == NULL) { @@ -3774,8 +3783,10 @@ exit: if (dirp != NULL) { Py_BEGIN_ALLOW_THREADS +#ifdef HAVE_FDOPENDIR if (fd > -1) rewinddir(dirp); +#endif /* HAVE_FDOPENDIR */ closedir(dirp); Py_END_ALLOW_THREADS } -- Repository URL: http://hg.python.org/cpython

1 0

peps: Always defer to project specific guides
by nick.coghlan Aug. 2, 2013

Aug. 2, 2013

http://hg.python.org/peps/rev/65d15d968219 changeset: 5017:65d15d968219 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Fri Aug 02 12:30:37 2013 +1000 summary: Always defer to project specific guides files: pep-0008.txt | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pep-0008.txt b/pep-0008.txt --- a/pep-0008.txt +++ b/pep-0008.txt @@ -28,9 +28,8 @@ identified and past conventions are rendered obsolete by changes in the language itself. -Many projects incorporate this guide by reference into their own style -guides. In the event of any conflicts, the project-specific style guide -takes precedence. +Many projects have their own coding style guidelines. In the event of any +conflicts, such project-specific guides take precedence for that project. A Foolish Consistency is the Hobgoblin of Little Minds -- Repository URL: http://hg.python.org/peps

1 0

peps: Additional PEP 8 tweaks
by nick.coghlan Aug. 2, 2013

Aug. 2, 2013

http://hg.python.org/peps/rev/59e060c2ffe7 changeset: 5016:59e060c2ffe7 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Fri Aug 02 12:26:24 2013 +1000 summary: Additional PEP 8 tweaks - be explicit that project style guides take precedence - make a line splitting example consistent with other guidelines - clarify wording of the def-vs-lambda guideline files: pep-0008.txt | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pep-0008.txt b/pep-0008.txt --- a/pep-0008.txt +++ b/pep-0008.txt @@ -28,6 +28,10 @@ identified and past conventions are rendered obsolete by changes in the language itself. +Many projects incorporate this guide by reference into their own style +guides. In the event of any conflicts, the project-specific style guide +takes precedence. + A Foolish Consistency is the Hobgoblin of Little Minds ====================================================== @@ -201,8 +205,8 @@ def __init__(self, width, height, color='black', emphasis=None, highlight=0): if (width == 0 and height == 0 and - color == 'red' and emphasis == 'strong' or - highlight > 100): + color == 'red' and emphasis == 'strong' or + highlight > 100): raise ValueError("sorry, you lose") if width == 0 and height == 0 and (color == 'red' or emphasis is None): @@ -882,8 +886,8 @@ operator. However, it is best to implement all six operations so that confusion doesn't arise in other contexts. -- Always use a def statement instead of assigning a lambda expression - to a name. +- Always use a def statement instead of an assignment statement that binds + a lambda expression directly to a name. Yes:: -- Repository URL: http://hg.python.org/peps

1 0

cpython: Issue #17899: Fix rare file descriptor leak in os.listdir().
by larry.hastings Aug. 2, 2013

Aug. 2, 2013

http://hg.python.org/cpython/rev/e51cbc45f4ca changeset: 84966:e51cbc45f4ca user: Larry Hastings <larry(a)hastings.org> date: Thu Aug 01 18:18:56 2013 -0700 summary: Issue #17899: Fix rare file descriptor leak in os.listdir(). files: Misc/NEWS | 2 ++ Modules/posixmodule.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,8 @@ Core and Builtins ----------------- +- Issue #17899: Fix rare file descriptor leak in os.listdir(). + - Issue #10241: Clear extension module dict copies at interpreter shutdown. Patch by Neil Schemenauer, minimally modified. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -3420,12 +3420,13 @@ static PyObject * _posix_listdir(path_t *path, PyObject *list) { - int fd = -1; - PyObject *v; DIR *dirp = NULL; struct dirent *ep; int return_str; /* if false, return bytes */ +#ifdef HAVE_FDOPENDIR + int fd = -1; +#endif errno = 0; #ifdef HAVE_FDOPENDIR @@ -3467,6 +3468,13 @@ if (dirp == NULL) { list = path_error(path); +#ifdef HAVE_FDOPENDIR + if (fd != -1) { + Py_BEGIN_ALLOW_THREADS + close(fd); + Py_END_ALLOW_THREADS + } +#endif goto exit; } if ((list = PyList_New(0)) == NULL) { @@ -3509,8 +3517,10 @@ exit: if (dirp != NULL) { Py_BEGIN_ALLOW_THREADS +#ifdef HAVE_FDOPENDIR if (fd > -1) rewinddir(dirp); +#endif closedir(dirp); Py_END_ALLOW_THREADS } -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #18519: Fix test_sqlite on old versions of libsqlite3
by victor.stinner Aug. 1, 2013

Aug. 1, 2013

http://hg.python.org/cpython/rev/c73f4dced6aa changeset: 84965:c73f4dced6aa user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Aug 02 01:48:10 2013 +0200 summary: Issue #18519: Fix test_sqlite on old versions of libsqlite3 With old SQLite versions, _sqlite3_result_error() sets a new Python exception, so don't restore the previous exception. files: Modules/_sqlite/connection.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -698,6 +698,7 @@ _Py_IDENTIFIER(finalize); int ok; PyObject *exception, *value, *tb; + int restore; #ifdef WITH_THREAD PyGILState_STATE threadstate; @@ -715,6 +716,7 @@ /* Keep the exception (if any) of the last call to step() */ PyErr_Fetch(&exception, &value, &tb); + restore = 1; function_result = _PyObject_CallMethodId(*aggregate_instance, &PyId_finalize, ""); @@ -732,11 +734,18 @@ PyErr_Clear(); } _sqlite3_result_error(context, "user-defined aggregate's 'finalize' method raised error", -1); +#if SQLITE_VERSION_NUMBER < 3003003 + /* with old SQLite versions, _sqlite3_result_error() sets a new Python + exception, so don't restore the previous exception */ + restore = 0; +#endif } - /* Restore the exception (if any) of the last call to step(), - but clear also the current exception if finalize() failed */ - PyErr_Restore(exception, value, tb); + if (restore) { + /* Restore the exception (if any) of the last call to step(), + but clear also the current exception if finalize() failed */ + PyErr_Restore(exception, value, tb); + } error: #ifdef WITH_THREAD -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #18609, #18408: _ctypes_add_traceback() now clears the current exception
by victor.stinner Aug. 1, 2013

Aug. 1, 2013

http://hg.python.org/cpython/rev/de1ea7f84e08 changeset: 84964:de1ea7f84e08 user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Aug 02 00:47:47 2013 +0200 summary: Issue #18609, #18408: _ctypes_add_traceback() now clears the current exception while adding the traceback, because it may call indirectly a Python function and Python functions must not be called with an exception set. In the case of the issue #18609, _ctypes_add_traceback() called the iso8859-1 decoder which is implemented in Python. Python has a ISO-8859-1 codec implemented in C. It is not used because PyUnicode_Decode() only uses the C codec for other names (aliases) of this codec ("latin-1", "latin1" and "iso-8859-1"). files: Modules/_ctypes/callbacks.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c --- a/Modules/_ctypes/callbacks.c +++ b/Modules/_ctypes/callbacks.c @@ -98,20 +98,37 @@ PyObject *py_globals = 0; PyCodeObject *py_code = 0; PyFrameObject *py_frame = 0; + PyObject *exception, *value, *tb; + + /* (Save and) Clear the current exception. Python functions must not be + called with an exception set. Calling Python functions happens when + the codec of the filesystem encoding is implemented in pure Python. */ + PyErr_Fetch(&exception, &value, &tb); py_globals = PyDict_New(); - if (!py_globals) goto bad; + if (!py_globals) + goto bad; py_code = PyCode_NewEmpty(filename, funcname, lineno); - if (!py_code) goto bad; + if (!py_code) + goto bad; py_frame = PyFrame_New( PyThreadState_Get(), /*PyThreadState *tstate,*/ py_code, /*PyCodeObject *code,*/ py_globals, /*PyObject *globals,*/ 0 /*PyObject *locals*/ ); - if (!py_frame) goto bad; + if (!py_frame) + goto bad; py_frame->f_lineno = lineno; + + PyErr_Restore(exception, value, tb); PyTraceBack_Here(py_frame); + + Py_DECREF(py_globals); + Py_DECREF(py_code); + Py_DECREF(py_frame); + return; + bad: Py_XDECREF(py_globals); Py_XDECREF(py_code); -- Repository URL: http://hg.python.org/cpython

1 0