Mailman 3 June 2015 - Python-checkins

cpython (merge 3.3 -> 3.4): merge 3.3
by benjamin.peterson June 27, 2015

June 27, 2015

https://hg.python.org/cpython/rev/4f2333bb36f4 changeset: 96685:4f2333bb36f4 branch: 3.4 parent: 96678:368db4b1ced9 parent: 96684:acd5c9118931 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jun 27 13:56:46 2015 -0500 summary: merge 3.3 files: Misc/NEWS | 2 ++ Modules/_pickle.c | 26 ++++++++++---------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -91,6 +91,8 @@ - Issue #23796: peek and read1 methods of BufferedReader now raise ValueError if they called on a closed object. Patch by John Hergenroeder. +- Fix possible integer overflows in the pickle module. + - Issue #22931: Allow '[' and ']' in cookie values. - Issue #20274: Remove ignored and erroneous "kwargs" parameters from three diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -428,9 +428,7 @@ if (new_allocated > PY_SSIZE_T_MAX - allocated) goto nomemory; new_allocated += allocated; - if (new_allocated > (PY_SSIZE_T_MAX / sizeof(PyObject *))) - goto nomemory; - data = PyMem_REALLOC(data, new_allocated * sizeof(PyObject *)); + PyMem_RESIZE(data, PyObject *, new_allocated); if (data == NULL) goto nomemory; @@ -660,7 +658,7 @@ /* The table we get from _New() is probably smaller than we wanted. Free it and allocate one that's the right size. */ PyMem_FREE(new->mt_table); - new->mt_table = PyMem_MALLOC(self->mt_allocated * sizeof(PyMemoEntry)); + new->mt_table = PyMem_NEW(PyMemoEntry, self->mt_allocated); if (new->mt_table == NULL) { PyMem_FREE(new); PyErr_NoMemory(); @@ -755,7 +753,7 @@ /* Allocate new table. */ oldtable = self->mt_table; - self->mt_table = PyMem_MALLOC(new_size * sizeof(PyMemoEntry)); + self->mt_table = PyMem_NEW(PyMemoEntry, new_size); if (self->mt_table == NULL) { self->mt_table = oldtable; PyErr_NoMemory(); @@ -1261,16 +1259,14 @@ _Unpickler_ResizeMemoList(UnpicklerObject *self, Py_ssize_t new_size) { Py_ssize_t i; - PyObject **memo; assert(new_size > self->memo_size); - memo = PyMem_REALLOC(self->memo, new_size * sizeof(PyObject *)); - if (memo == NULL) { + PyMem_RESIZE(self->memo, PyObject *, new_size); + if (self->memo == NULL) { PyErr_NoMemory(); return -1; } - self->memo = memo; for (i = self->memo_size; i < new_size; i++) self->memo[i] = NULL; self->memo_size = new_size; @@ -1314,7 +1310,7 @@ static PyObject ** _Unpickler_NewMemo(Py_ssize_t new_size) { - PyObject **memo = PyMem_MALLOC(new_size * sizeof(PyObject *)); + PyObject **memo = PyMem_NEW(PyObject *, new_size); if (memo == NULL) { PyErr_NoMemory(); return NULL; @@ -5963,7 +5959,6 @@ if ((self->num_marks + 1) >= self->marks_size) { size_t alloc; - Py_ssize_t *marks; /* Use the size_t type to check for overflow. */ alloc = ((size_t)self->num_marks << 1) + 20; @@ -5974,15 +5969,14 @@ } if (self->marks == NULL) - marks = (Py_ssize_t *) PyMem_Malloc(alloc * sizeof(Py_ssize_t)); + self->marks = PyMem_NEW(Py_ssize_t, alloc); else - marks = (Py_ssize_t *) PyMem_Realloc(self->marks, - alloc * sizeof(Py_ssize_t)); - if (marks == NULL) { + PyMem_RESIZE(self->marks, Py_ssize_t, alloc); + if (self->marks == NULL) { + self->marks_size = 0; PyErr_NoMemory(); return -1; } - self->marks = marks; self->marks_size = (Py_ssize_t)alloc; } -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> 3.5): merge 3.4
by benjamin.peterson June 27, 2015

June 27, 2015

https://hg.python.org/cpython/rev/e1a5c2824f42 changeset: 96686:e1a5c2824f42 branch: 3.5 parent: 96679:68629ebe0fee parent: 96685:4f2333bb36f4 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jun 27 14:18:23 2015 -0500 summary: merge 3.4 files: Misc/NEWS | 2 ++ Modules/_pickle.c | 26 ++++++++++---------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -444,6 +444,8 @@ lines from the code object, fixing an issue when a lambda function is used as decorator argument. Patch by Thomas Ballinger and Allison Kaptur. +- Fix possible integer overflows in the pickle module. + - Issue #22931: Allow '[' and ']' in cookie values. - The keywords attribute of functools.partial is now always a dictionary. diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -439,9 +439,7 @@ if (new_allocated > (size_t)PY_SSIZE_T_MAX - allocated) goto nomemory; new_allocated += allocated; - if (new_allocated > ((size_t)PY_SSIZE_T_MAX / sizeof(PyObject *))) - goto nomemory; - data = PyMem_REALLOC(data, new_allocated * sizeof(PyObject *)); + PyMem_RESIZE(data, PyObject *, new_allocated); if (data == NULL) goto nomemory; @@ -671,7 +669,7 @@ /* The table we get from _New() is probably smaller than we wanted. Free it and allocate one that's the right size. */ PyMem_FREE(new->mt_table); - new->mt_table = PyMem_MALLOC(self->mt_allocated * sizeof(PyMemoEntry)); + new->mt_table = PyMem_NEW(PyMemoEntry, self->mt_allocated); if (new->mt_table == NULL) { PyMem_FREE(new); PyErr_NoMemory(); @@ -766,7 +764,7 @@ /* Allocate new table. */ oldtable = self->mt_table; - self->mt_table = PyMem_MALLOC(new_size * sizeof(PyMemoEntry)); + self->mt_table = PyMem_NEW(PyMemoEntry, new_size); if (self->mt_table == NULL) { self->mt_table = oldtable; PyErr_NoMemory(); @@ -1272,16 +1270,14 @@ _Unpickler_ResizeMemoList(UnpicklerObject *self, Py_ssize_t new_size) { Py_ssize_t i; - PyObject **memo; assert(new_size > self->memo_size); - memo = PyMem_REALLOC(self->memo, new_size * sizeof(PyObject *)); - if (memo == NULL) { + PyMem_RESIZE(self->memo, PyObject *, new_size); + if (self->memo == NULL) { PyErr_NoMemory(); return -1; } - self->memo = memo; for (i = self->memo_size; i < new_size; i++) self->memo[i] = NULL; self->memo_size = new_size; @@ -1325,7 +1321,7 @@ static PyObject ** _Unpickler_NewMemo(Py_ssize_t new_size) { - PyObject **memo = PyMem_MALLOC(new_size * sizeof(PyObject *)); + PyObject **memo = PyMem_NEW(PyObject *, new_size); if (memo == NULL) { PyErr_NoMemory(); return NULL; @@ -6032,7 +6028,6 @@ if ((self->num_marks + 1) >= self->marks_size) { size_t alloc; - Py_ssize_t *marks; /* Use the size_t type to check for overflow. */ alloc = ((size_t)self->num_marks << 1) + 20; @@ -6043,15 +6038,14 @@ } if (self->marks == NULL) - marks = (Py_ssize_t *) PyMem_Malloc(alloc * sizeof(Py_ssize_t)); + self->marks = PyMem_NEW(Py_ssize_t, alloc); else - marks = (Py_ssize_t *) PyMem_Realloc(self->marks, - alloc * sizeof(Py_ssize_t)); - if (marks == NULL) { + PyMem_RESIZE(self->marks, Py_ssize_t, alloc); + if (self->marks == NULL) { + self->marks_size = 0; PyErr_NoMemory(); return -1; } - self->marks = marks; self->marks_size = (Py_ssize_t)alloc; } -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): merge 3.5
by benjamin.peterson June 27, 2015

June 27, 2015

https://hg.python.org/cpython/rev/5c725bf42721 changeset: 96687:5c725bf42721 parent: 96683:d9e83e426565 parent: 96686:e1a5c2824f42 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jun 27 14:18:44 2015 -0500 summary: merge 3.5 files: Misc/NEWS | 2 ++ Modules/_pickle.c | 26 ++++++++++---------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -463,6 +463,8 @@ lines from the code object, fixing an issue when a lambda function is used as decorator argument. Patch by Thomas Ballinger and Allison Kaptur. +- Fix possible integer overflows in the pickle module. + - Issue #22931: Allow '[' and ']' in cookie values. - The keywords attribute of functools.partial is now always a dictionary. diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -439,9 +439,7 @@ if (new_allocated > (size_t)PY_SSIZE_T_MAX - allocated) goto nomemory; new_allocated += allocated; - if (new_allocated > ((size_t)PY_SSIZE_T_MAX / sizeof(PyObject *))) - goto nomemory; - data = PyMem_REALLOC(data, new_allocated * sizeof(PyObject *)); + PyMem_RESIZE(data, PyObject *, new_allocated); if (data == NULL) goto nomemory; @@ -671,7 +669,7 @@ /* The table we get from _New() is probably smaller than we wanted. Free it and allocate one that's the right size. */ PyMem_FREE(new->mt_table); - new->mt_table = PyMem_MALLOC(self->mt_allocated * sizeof(PyMemoEntry)); + new->mt_table = PyMem_NEW(PyMemoEntry, self->mt_allocated); if (new->mt_table == NULL) { PyMem_FREE(new); PyErr_NoMemory(); @@ -766,7 +764,7 @@ /* Allocate new table. */ oldtable = self->mt_table; - self->mt_table = PyMem_MALLOC(new_size * sizeof(PyMemoEntry)); + self->mt_table = PyMem_NEW(PyMemoEntry, new_size); if (self->mt_table == NULL) { self->mt_table = oldtable; PyErr_NoMemory(); @@ -1272,16 +1270,14 @@ _Unpickler_ResizeMemoList(UnpicklerObject *self, Py_ssize_t new_size) { Py_ssize_t i; - PyObject **memo; assert(new_size > self->memo_size); - memo = PyMem_REALLOC(self->memo, new_size * sizeof(PyObject *)); - if (memo == NULL) { + PyMem_RESIZE(self->memo, PyObject *, new_size); + if (self->memo == NULL) { PyErr_NoMemory(); return -1; } - self->memo = memo; for (i = self->memo_size; i < new_size; i++) self->memo[i] = NULL; self->memo_size = new_size; @@ -1325,7 +1321,7 @@ static PyObject ** _Unpickler_NewMemo(Py_ssize_t new_size) { - PyObject **memo = PyMem_MALLOC(new_size * sizeof(PyObject *)); + PyObject **memo = PyMem_NEW(PyObject *, new_size); if (memo == NULL) { PyErr_NoMemory(); return NULL; @@ -6032,7 +6028,6 @@ if ((self->num_marks + 1) >= self->marks_size) { size_t alloc; - Py_ssize_t *marks; /* Use the size_t type to check for overflow. */ alloc = ((size_t)self->num_marks << 1) + 20; @@ -6043,15 +6038,14 @@ } if (self->marks == NULL) - marks = (Py_ssize_t *) PyMem_Malloc(alloc * sizeof(Py_ssize_t)); + self->marks = PyMem_NEW(Py_ssize_t, alloc); else - marks = (Py_ssize_t *) PyMem_Realloc(self->marks, - alloc * sizeof(Py_ssize_t)); - if (marks == NULL) { + PyMem_RESIZE(self->marks, Py_ssize_t, alloc); + if (self->marks == NULL) { + self->marks_size = 0; PyErr_NoMemory(); return -1; } - self->marks = marks; self->marks_size = (Py_ssize_t)alloc; } -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.3): use safe allocation and reallocation macros
by benjamin.peterson June 27, 2015

June 27, 2015

https://hg.python.org/cpython/rev/acd5c9118931 changeset: 96684:acd5c9118931 branch: 3.3 parent: 96485:035aa81c2ba8 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Jun 27 13:41:33 2015 -0500 summary: use safe allocation and reallocation macros files: Misc/NEWS | 2 ++ Modules/_pickle.c | 26 ++++++++++---------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -22,6 +22,8 @@ Library ------- +- Fix possible integer overflows in the pickle module. + - Issue #22931: Allow '[' and ']' in cookie values. - Issue #24094: Fix possible crash in json.encode with poorly behaved dict diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -218,9 +218,7 @@ if (new_allocated > PY_SSIZE_T_MAX - allocated) goto nomemory; new_allocated += allocated; - if (new_allocated > (PY_SSIZE_T_MAX / sizeof(PyObject *))) - goto nomemory; - data = PyMem_REALLOC(data, new_allocated * sizeof(PyObject *)); + PyMem_RESIZE(data, PyObject *, new_allocated); if (data == NULL) goto nomemory; @@ -433,7 +431,7 @@ /* The table we get from _New() is probably smaller than we wanted. Free it and allocate one that's the right size. */ PyMem_FREE(new->mt_table); - new->mt_table = PyMem_MALLOC(self->mt_allocated * sizeof(PyMemoEntry)); + new->mt_table = PyMem_NEW(PyMemoEntry, self->mt_allocated); if (new->mt_table == NULL) { PyMem_FREE(new); return NULL; @@ -527,7 +525,7 @@ /* Allocate new table. */ oldtable = self->mt_table; - self->mt_table = PyMem_MALLOC(new_size * sizeof(PyMemoEntry)); + self->mt_table = PyMem_NEW(PyMemoEntry, new_size); if (self->mt_table == NULL) { PyMem_FREE(oldtable); PyErr_NoMemory(); @@ -1055,16 +1053,14 @@ _Unpickler_ResizeMemoList(UnpicklerObject *self, Py_ssize_t new_size) { Py_ssize_t i; - PyObject **memo; assert(new_size > self->memo_size); - memo = PyMem_REALLOC(self->memo, new_size * sizeof(PyObject *)); - if (memo == NULL) { + PyMem_RESIZE(self->memo, PyObject *, new_size); + if (self->memo == NULL) { PyErr_NoMemory(); return -1; } - self->memo = memo; for (i = self->memo_size; i < new_size; i++) self->memo[i] = NULL; self->memo_size = new_size; @@ -1103,7 +1099,7 @@ static PyObject ** _Unpickler_NewMemo(Py_ssize_t new_size) { - PyObject **memo = PyMem_MALLOC(new_size * sizeof(PyObject *)); + PyObject **memo = PyMem_NEW(PyObject *, new_size); if (memo == NULL) return NULL; memset(memo, 0, new_size * sizeof(PyObject *)); @@ -5270,7 +5266,6 @@ if ((self->num_marks + 1) >= self->marks_size) { size_t alloc; - Py_ssize_t *marks; /* Use the size_t type to check for overflow. */ alloc = ((size_t)self->num_marks << 1) + 20; @@ -5281,15 +5276,14 @@ } if (self->marks == NULL) - marks = (Py_ssize_t *) PyMem_Malloc(alloc * sizeof(Py_ssize_t)); + self->marks = PyMem_NEW(Py_ssize_t, alloc); else - marks = (Py_ssize_t *) PyMem_Realloc(self->marks, - alloc * sizeof(Py_ssize_t)); - if (marks == NULL) { + PyMem_RESIZE(self->marks, Py_ssize_t, alloc); + if (self->marks == NULL) { + self->marks_size = 0; PyErr_NoMemory(); return -1; } - self->marks = marks; self->marks_size = (Py_ssize_t)alloc; } -- Repository URL: https://hg.python.org/cpython

1 0

devguide: experts: Add myself to dis & contextlib
by yury.selivanov June 27, 2015

June 27, 2015

https://hg.python.org/devguide/rev/65872820a5e3 changeset: 748:65872820a5e3 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Sat Jun 27 06:40:47 2015 -0400 summary: experts: Add myself to dis & contextlib files: experts.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experts.rst b/experts.rst --- a/experts.rst +++ b/experts.rst @@ -83,7 +83,7 @@ compileall concurrent.futures bquinlan configparser lukasz.langa* -contextlib ncoghlan* +contextlib ncoghlan*, yselivanov copy alexandre.vassalotti copyreg alexandre.vassalotti cProfile @@ -96,7 +96,7 @@ dbm decimal facundobatista, rhettinger, mark.dickinson, skrah difflib tim.peters (inactive) -dis ncoghlan* +dis ncoghlan*, yselivanov distutils eric.araujo, dstufft doctest tim.peters (inactive) dummy_threading brett.cannon -- Repository URL: https://hg.python.org/devguide

1 0

Daily reference leaks (d9e83e426565): sum=4
by solipsis＠pitrou.net June 27, 2015

June 27, 2015

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

1 0

peps: PEP 492: Note API changes due to beta feedback
by nick.coghlan June 26, 2015

June 26, 2015

https://hg.python.org/peps/rev/0c963fa25db8 changeset: 5899:0c963fa25db8 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Sat Jun 27 11:37:37 2015 +1000 summary: PEP 492: Note API changes due to beta feedback files: pep-0492.txt | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/pep-0492.txt b/pep-0492.txt --- a/pep-0492.txt +++ b/pep-0492.txt @@ -40,6 +40,20 @@ adopt, similar features: [2]_, [5]_, [6]_, [7]_, [8]_, [10]_. +API Design and Implementation Note +================================== + +Feedback on the initial beta release of Python 3.5 resulted in a redesign +of the object model supporting this PEP to more clearly separate native +coroutines from generators - rather than being a new kind of generator, +native coroutines are now their own completely distinct type (implemented +in [17]_). + +This change was implemented based primarily due to problems encountered +attempting to integrate support for native coroutines into the Tornado web +server (reported in [18]_). + + Rationale and Goals =================== @@ -1451,6 +1465,9 @@ .. [16] https://github.com/python/asyncio/issues/233 +.. [17] https://hg.python.org/cpython/rev/7a0a1a4ac639 + +.. [18] http://bugs.python.org/issue24400 Acknowledgments =============== -- Repository URL: https://hg.python.org/peps

1 0

peps: archive 2.7.10
by benjamin.peterson June 26, 2015

June 26, 2015

https://hg.python.org/peps/rev/466e0d02ae36 changeset: 5898:466e0d02ae36 user: Benjamin Peterson <benjamin(a)python.org> date: Fri Jun 26 19:03:02 2015 -0500 summary: archive 2.7.10 files: pep-0373.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0373.txt b/pep-0373.txt --- a/pep-0373.txt +++ b/pep-0373.txt @@ -56,8 +56,6 @@ Planned future release dates: -- 2.7.10rc1 2015-05-09 -- 2.7.10 2015-05-23 - 2.7.11 December, 2015 - beyond this date, releases as needed @@ -78,6 +76,8 @@ - 2.7.8 2014-06-30 - 2.7.9rc1 2014-11-26 - 2.7.9 2014-12-10 +- 2.7.10rc1 2015-05-09 +- 2.7.10 2015-05-23 2.7.0 Release Schedule ====================== -- Repository URL: https://hg.python.org/peps

1 0

cpython: Minor tweeak to tighten the inner-loop.
by raymond.hettinger June 26, 2015

June 26, 2015

https://hg.python.org/cpython/rev/d9e83e426565 changeset: 96683:d9e83e426565 parent: 96680:7846aadbd4f5 user: Raymond Hettinger <python(a)rcn.com> date: Fri Jun 26 02:50:21 2015 -0700 summary: Minor tweeak to tighten the inner-loop. files: Objects/setobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Objects/setobject.c b/Objects/setobject.c --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -199,7 +199,7 @@ goto found_active; mask = so->mask; } - if (entry->hash == -1 && freeslot == NULL) + else if (entry->hash == -1 && freeslot == NULL) freeslot = entry; } } -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (7846aadbd4f5): sum=4
by solipsis＠pitrou.net June 26, 2015

June 26, 2015

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

1 0