Mailman 3 November 2016 - Python-checkins

cpython: Fix a ResourceWarning in generate_opcode_h.py
by victor.stinner Nov. 25, 2016

Nov. 25, 2016

https://hg.python.org/cpython/rev/46e2755b022c changeset: 105360:46e2755b022c user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Nov 25 11:59:52 2016 +0100 summary: Fix a ResourceWarning in generate_opcode_h.py Use a context manager to close the Python file. Replace also open() with tokenize.open() to handle coding cookie if any in Lib/opcode.py. files: Tools/scripts/generate_opcode_h.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Tools/scripts/generate_opcode_h.py b/Tools/scripts/generate_opcode_h.py --- a/Tools/scripts/generate_opcode_h.py +++ b/Tools/scripts/generate_opcode_h.py @@ -32,10 +32,14 @@ #endif /* !Py_OPCODE_H */ """ +import tokenize + def main(opcode_py, outfile='Include/opcode.h'): opcode = {} - exec(open(opcode_py).read(), opcode) + with tokenize.open(opcode_py) as fp: + code = fp.read() + exec(code, opcode) opmap = opcode['opmap'] with open(outfile, 'w') as fobj: fobj.write(header) -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (45713818fd81): sum=6
by solipsis＠pitrou.net Nov. 25, 2016

Nov. 25, 2016

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

1 0

cpython: Issue #28792: Remove aliases from _bisect
by victor.stinner Nov. 24, 2016

Nov. 24, 2016

https://hg.python.org/cpython/rev/45713818fd81 changeset: 105359:45713818fd81 user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Nov 24 23:31:59 2016 +0100 summary: Issue #28792: Remove aliases from _bisect Remove aliases from the C module. Always implement bisect() and insort() aliases in bisect.py Remove also the "# backward compatibility" command, there is no plan to deprecate nor remove these aliases. When keys are equal, it makes sense to use bisect.bisect() and bisect.insort(). files: Lib/bisect.py | 8 ++++---- Modules/_bisectmodule.c | 7 ------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Lib/bisect.py b/Lib/bisect.py --- a/Lib/bisect.py +++ b/Lib/bisect.py @@ -19,8 +19,6 @@ else: lo = mid+1 a.insert(lo, x) -insort = insort_right # backward compatibility - def bisect_right(a, x, lo=0, hi=None): """Return the index where to insert item x in list a, assuming a is sorted. @@ -42,8 +40,6 @@ else: lo = mid+1 return lo -bisect = bisect_right # backward compatibility - def insort_left(a, x, lo=0, hi=None): """Insert item x in list a, and keep it sorted assuming a is sorted. @@ -90,3 +86,7 @@ from _bisect import * except ImportError: pass + +# Create aliases +bisect = bisect_right +insort = insort_right diff --git a/Modules/_bisectmodule.c b/Modules/_bisectmodule.c --- a/Modules/_bisectmodule.c +++ b/Modules/_bisectmodule.c @@ -216,18 +216,11 @@ Optional args lo (default 0) and hi (default len(a)) bound the\n\ slice of a to be searched.\n"); -PyDoc_STRVAR(bisect_doc, "Alias for bisect_right().\n"); -PyDoc_STRVAR(insort_doc, "Alias for insort_right().\n"); - static PyMethodDef bisect_methods[] = { {"bisect_right", (PyCFunction)bisect_right, METH_VARARGS|METH_KEYWORDS, bisect_right_doc}, - {"bisect", (PyCFunction)bisect_right, - METH_VARARGS|METH_KEYWORDS, bisect_doc}, {"insort_right", (PyCFunction)insort_right, METH_VARARGS|METH_KEYWORDS, insort_right_doc}, - {"insort", (PyCFunction)insort_right, - METH_VARARGS|METH_KEYWORDS, insort_doc}, {"bisect_left", (PyCFunction)bisect_left, METH_VARARGS|METH_KEYWORDS, bisect_left_doc}, {"insort_left", (PyCFunction)insort_left, -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.6): Fix _PyGen_yf()
by victor.stinner Nov. 24, 2016

Nov. 24, 2016

https://hg.python.org/cpython/rev/303cedfb9e7a changeset: 105357:303cedfb9e7a branch: 3.6 parent: 105354:7059e68db068 user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Nov 24 22:33:01 2016 +0100 summary: Fix _PyGen_yf() Issue #28782: Fix a bug in the implementation ``yield from`` when checking if the next instruction is YIELD_FROM. Regression introduced by WORDCODE (issue #26647). Reviewed by Serhiy Storchaka and Yury Selivanov. files: Misc/NEWS | 4 ++++ Objects/genobject.c | 9 +++++++++ Python/ceval.c | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,10 @@ Core and Builtins ----------------- +- Issue #28782: Fix a bug in the implementation ``yield from`` when checking + if the next instruction is YIELD_FROM. Regression introduced by WORDCODE + (issue #26647). + Library ------- diff --git a/Objects/genobject.c b/Objects/genobject.c --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -355,6 +355,14 @@ PyObject *bytecode = f->f_code->co_code; unsigned char *code = (unsigned char *)PyBytes_AS_STRING(bytecode); + if (f->f_lasti < 0) { + /* Return immediately if the frame didn't start yet. YIELD_FROM + always come after LOAD_CONST: a code object should not start + with YIELD_FROM */ + assert(code[0] != YIELD_FROM); + return NULL; + } + if (code[f->f_lasti + sizeof(_Py_CODEUNIT)] != YIELD_FROM) return NULL; yf = f->f_stacktop[-1]; @@ -463,6 +471,7 @@ assert(ret == yf); Py_DECREF(ret); /* Termination repetition of YIELD_FROM */ + assert(gen->gi_frame->f_lasti >= 0); gen->gi_frame->f_lasti += sizeof(_Py_CODEUNIT); if (_PyGen_FetchStopIterationValue(&val) == 0) { ret = gen_send_ex(gen, val, 0, 0); diff --git a/Python/ceval.c b/Python/ceval.c --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2043,6 +2043,7 @@ f->f_stacktop = stack_pointer; why = WHY_YIELD; /* and repeat... */ + assert(f->f_lasti >= (int)sizeof(_Py_CODEUNIT)); f->f_lasti -= sizeof(_Py_CODEUNIT); goto fast_yield; } -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): Merge 3.6
by victor.stinner Nov. 24, 2016

Nov. 24, 2016

https://hg.python.org/cpython/rev/72b8a7423cac changeset: 105356:72b8a7423cac parent: 105355:00bfe5bd3553 parent: 105354:7059e68db068 user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Nov 24 22:31:25 2016 +0100 summary: Merge 3.6 files: -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): Merge 3.6
by victor.stinner Nov. 24, 2016

Nov. 24, 2016

https://hg.python.org/cpython/rev/6453ff3328b8 changeset: 105358:6453ff3328b8 parent: 105356:72b8a7423cac parent: 105357:303cedfb9e7a user: Victor Stinner <victor.stinner(a)gmail.com> date: Thu Nov 24 22:33:49 2016 +0100 summary: Merge 3.6 files: Misc/NEWS | 4 ++++ Objects/genobject.c | 9 +++++++++ Python/ceval.c | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,10 @@ Core and Builtins ----------------- +- Issue #28782: Fix a bug in the implementation ``yield from`` when checking + if the next instruction is YIELD_FROM. Regression introduced by WORDCODE + (issue #26647). + - Issue #28774: Fix error position of the unicode error in ASCII and Latin1 encoders when a string returned by the error handler contains multiple non-encodable characters (non-ASCII for the ASCII codec, characters out diff --git a/Objects/genobject.c b/Objects/genobject.c --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -355,6 +355,14 @@ PyObject *bytecode = f->f_code->co_code; unsigned char *code = (unsigned char *)PyBytes_AS_STRING(bytecode); + if (f->f_lasti < 0) { + /* Return immediately if the frame didn't start yet. YIELD_FROM + always come after LOAD_CONST: a code object should not start + with YIELD_FROM */ + assert(code[0] != YIELD_FROM); + return NULL; + } + if (code[f->f_lasti + sizeof(_Py_CODEUNIT)] != YIELD_FROM) return NULL; yf = f->f_stacktop[-1]; @@ -463,6 +471,7 @@ assert(ret == yf); Py_DECREF(ret); /* Termination repetition of YIELD_FROM */ + assert(gen->gi_frame->f_lasti >= 0); gen->gi_frame->f_lasti += sizeof(_Py_CODEUNIT); if (_PyGen_FetchStopIterationValue(&val) == 0) { ret = gen_send_ex(gen, val, 0, 0); diff --git a/Python/ceval.c b/Python/ceval.c --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2049,6 +2049,7 @@ f->f_stacktop = stack_pointer; why = WHY_YIELD; /* and repeat... */ + assert(f->f_lasti >= (int)sizeof(_Py_CODEUNIT)); f->f_lasti -= sizeof(_Py_CODEUNIT); goto fast_yield; } -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Issue #28773: Add typing.FrozenSet docs. (Manuel Krebber) (3.6->3.7)
by guido.van.rossum Nov. 24, 2016

Nov. 24, 2016

https://hg.python.org/cpython/rev/00bfe5bd3553 changeset: 105355:00bfe5bd3553 parent: 105352:971ac6837060 parent: 105353:5d83b6a9b568 user: Guido van Rossum <guido(a)python.org> date: Thu Nov 24 11:57:05 2016 -0800 summary: Issue #28773: Add typing.FrozenSet docs. (Manuel Krebber) (3.6->3.7) files: Doc/library/typing.rst | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -584,6 +584,10 @@ A generic version of :class:`builtins.set <set>`. +.. class:: FrozenSet(frozenset, AbstractSet[T_co]) + + A generic version of :class:`builtins.frozenset <frozenset>`. + .. class:: MappingView(Sized, Iterable[T_co]) A generic version of :class:`collections.abc.MappingView`. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> 3.6): Issue #28773: Add typing.FrozenSet docs. (Manuel Krebber) (3.5->3.6)
by guido.van.rossum Nov. 24, 2016

Nov. 24, 2016

https://hg.python.org/cpython/rev/7059e68db068 changeset: 105354:7059e68db068 branch: 3.6 parent: 105351:e11df6aa5bf1 parent: 105353:5d83b6a9b568 user: Guido van Rossum <guido(a)python.org> date: Thu Nov 24 11:56:40 2016 -0800 summary: Issue #28773: Add typing.FrozenSet docs. (Manuel Krebber) (3.5->3.6) files: Doc/library/typing.rst | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -584,6 +584,10 @@ A generic version of :class:`builtins.set <set>`. +.. class:: FrozenSet(frozenset, AbstractSet[T_co]) + + A generic version of :class:`builtins.frozenset <frozenset>`. + .. class:: MappingView(Sized, Iterable[T_co]) A generic version of :class:`collections.abc.MappingView`. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #28773: Add typing.FrozenSet docs. (Manuel Krebber)
by guido.van.rossum Nov. 24, 2016

Nov. 24, 2016

https://hg.python.org/cpython/rev/5d83b6a9b568 changeset: 105353:5d83b6a9b568 branch: 3.5 parent: 105346:f7aa200bed8d user: Guido van Rossum <guido(a)python.org> date: Thu Nov 24 11:56:00 2016 -0800 summary: Issue #28773: Add typing.FrozenSet docs. (Manuel Krebber) files: Doc/library/typing.rst | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -578,6 +578,10 @@ A generic version of :class:`builtins.set <set>`. +.. class:: FrozenSet(frozenset, AbstractSet[T_co]) + + A generic version of :class:`builtins.frozenset <frozenset>`. + .. class:: MappingView(Sized, Iterable[T_co]) A generic version of :class:`collections.abc.MappingView`. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): merge
by raymond.hettinger Nov. 24, 2016

Nov. 24, 2016

https://hg.python.org/cpython/rev/971ac6837060 changeset: 105352:971ac6837060 parent: 105350:3f9f13077ca8 parent: 105351:e11df6aa5bf1 user: Raymond Hettinger <python(a)rcn.com> date: Thu Nov 24 10:50:57 2016 -0800 summary: merge files: Lib/test/test_with.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_with.py b/Lib/test/test_with.py --- a/Lib/test/test_with.py +++ b/Lib/test/test_with.py @@ -117,7 +117,7 @@ def fooLacksEnter(): foo = LacksEnter() with foo: pass - self.assertRaisesRegexp(AttributeError, '__enter__', fooLacksEnter) + self.assertRaisesRegex(AttributeError, '__enter__', fooLacksEnter) def testEnterAttributeError2(self): class LacksEnterAndExit(object): @@ -126,7 +126,7 @@ def fooLacksEnterAndExit(): foo = LacksEnterAndExit() with foo: pass - self.assertRaisesRegexp(AttributeError, '__enter__', fooLacksEnterAndExit) + self.assertRaisesRegex(AttributeError, '__enter__', fooLacksEnterAndExit) def testExitAttributeError(self): class LacksExit(object): @@ -136,7 +136,7 @@ def fooLacksExit(): foo = LacksExit() with foo: pass - self.assertRaisesRegexp(AttributeError, '__exit__', fooLacksExit) + self.assertRaisesRegex(AttributeError, '__exit__', fooLacksExit) def assertRaisesSyntaxError(self, codestr): def shouldRaiseSyntaxError(s): -- Repository URL: https://hg.python.org/cpython

1 0