Mailman 3 April 2018 - Python-checkins

[3.7] bpo-33363: raise SyntaxError for async for/with outside async functions (GH-6616). (GH-6619)
by Yury Selivanov April 27, 2018

April 27, 2018

https://github.com/python/cpython/commit/a93a663d6c2fdfbddbda9729c96e2737c0… commit: a93a663d6c2fdfbddbda9729c96e2737c0012522 branch: 3.7 author: Zsolt Dollenstein <zsol.zsol(a)gmail.com> committer: Yury Selivanov <yury(a)magic.io> date: 2018-04-27T18:33:37-04:00 summary: [3.7] bpo-33363: raise SyntaxError for async for/with outside async functions (GH-6616). (GH-6619) files: A Misc/NEWS.d/next/Core and Builtins/2018-04-26-22-48-28.bpo-33363.8RCnN2.rst M Lib/test/test_coroutines.py M Python/compile.c diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py index ea54bca0df0d..ac24f3976738 100644 --- a/Lib/test/test_coroutines.py +++ b/Lib/test/test_coroutines.py @@ -362,7 +362,22 @@ def bar(): """def foo(): async def bar(): pass\nawait a - """] + """, + """def foo(): + async for i in arange(2): + pass + """, + """def foo(): + async with resource: + pass + """, + """async with resource: + pass + """, + """async for i in arange(2): + pass + """, + ] for code in samples: with self.subTest(code=code), self.assertRaises(SyntaxError): diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-26-22-48-28.bpo-33363.8RCnN2.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-26-22-48-28.bpo-33363.8RCnN2.rst new file mode 100644 index 000000000000..ad8d24895343 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-26-22-48-28.bpo-33363.8RCnN2.rst @@ -0,0 +1,2 @@ +Raise a SyntaxError for ``async with`` and ``async for`` statements outside +of async functions. diff --git a/Python/compile.c b/Python/compile.c index d4245e2f4e50..62d78867e077 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -2339,6 +2339,10 @@ compiler_async_for(struct compiler *c, stmt_ty s) basicblock *try, *except, *end, *after_try, *try_cleanup, *after_loop_else; + if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION) { + return compiler_error(c, "'async for' outside async function"); + } + PyObject *stop_aiter_error = _PyUnicode_FromId(&PyId_StopAsyncIteration); if (stop_aiter_error == NULL) { return 0; @@ -4204,6 +4208,9 @@ compiler_async_with(struct compiler *c, stmt_ty s, int pos) withitem_ty item = asdl_seq_GET(s->v.AsyncWith.items, pos); assert(s->kind == AsyncWith_kind); + if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION) { + return compiler_error(c, "'async with' outside async function"); + } block = compiler_new_block(c); finally = compiler_new_block(c);

1 0

bpo-33363: raise SyntaxError for async for/with outside async functions (#6616)
by Yury Selivanov April 27, 2018

April 27, 2018

https://github.com/python/cpython/commit/e2396506606115e785c94ec129eb86e2ed… commit: e2396506606115e785c94ec129eb86e2ed0aa744 branch: master author: Zsolt Dollenstein <zsol.zsol(a)gmail.com> committer: Yury Selivanov <yury(a)magic.io> date: 2018-04-27T11:58:56-04:00 summary: bpo-33363: raise SyntaxError for async for/with outside async functions (#6616) files: A Misc/NEWS.d/next/Core and Builtins/2018-04-26-22-48-28.bpo-33363.8RCnN2.rst M Lib/test/test_coroutines.py M Python/compile.c diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py index 10f7cca50473..47753e2ef03f 100644 --- a/Lib/test/test_coroutines.py +++ b/Lib/test/test_coroutines.py @@ -362,7 +362,22 @@ def bar(): """def foo(): async def bar(): pass\nawait a - """] + """, + """def foo(): + async for i in arange(2): + pass + """, + """def foo(): + async with resource: + pass + """, + """async with resource: + pass + """, + """async for i in arange(2): + pass + """, + ] for code in samples: with self.subTest(code=code), self.assertRaises(SyntaxError): diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-26-22-48-28.bpo-33363.8RCnN2.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-26-22-48-28.bpo-33363.8RCnN2.rst new file mode 100644 index 000000000000..ad8d24895343 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-26-22-48-28.bpo-33363.8RCnN2.rst @@ -0,0 +1,2 @@ +Raise a SyntaxError for ``async with`` and ``async for`` statements outside +of async functions. diff --git a/Python/compile.c b/Python/compile.c index cc0988f68e25..7960f09319e7 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -2447,6 +2447,10 @@ static int compiler_async_for(struct compiler *c, stmt_ty s) { basicblock *start, *except, *end; + if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION) { + return compiler_error(c, "'async for' outside async function"); + } + start = compiler_new_block(c); except = compiler_new_block(c); end = compiler_new_block(c); @@ -4262,6 +4266,9 @@ compiler_async_with(struct compiler *c, stmt_ty s, int pos) withitem_ty item = asdl_seq_GET(s->v.AsyncWith.items, pos); assert(s->kind == AsyncWith_kind); + if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION) { + return compiler_error(c, "'async with' outside async function"); + } block = compiler_new_block(c); finally = compiler_new_block(c);

1 0

bpo-33358: Fix test_embed.test_pre_initialization_sys_options (GH-6612)
by Miss Islington (bot) April 27, 2018

April 27, 2018

https://github.com/python/cpython/commit/dd3ede7537653a62815c2fedbb67d6f2fb… commit: dd3ede7537653a62815c2fedbb67d6f2fb870d4c branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-27T05:41:25-07:00 summary: bpo-33358: Fix test_embed.test_pre_initialization_sys_options (GH-6612) Fix test_embed.test_pre_initialization_sys_options() when building with --enable-shared (cherry picked from commit 4114846265536344538ae44cb8ffd8ce2903faf7) Co-authored-by: Pablo Galindo <Pablogsal(a)gmail.com> files: A Misc/NEWS.d/next/Tests/2018-04-27-11-46-35.bpo-33358._OcR59.rst M Lib/test/test_embed.py diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py index f926301b8466..c52cb9948782 100644 --- a/Lib/test/test_embed.py +++ b/Lib/test/test_embed.py @@ -208,7 +208,7 @@ def test_pre_initialization_sys_options(self): Checks that sys.warnoptions and sys._xoptions can be set before the runtime is initialized (otherwise they won't be effective). """ - env = dict(PYTHONPATH=os.pathsep.join(sys.path)) + env = dict(os.environ, PYTHONPATH=os.pathsep.join(sys.path)) out, err = self.run_embedded_interpreter( "pre_initialization_sys_options", env=env) expected_output = ( diff --git a/Misc/NEWS.d/next/Tests/2018-04-27-11-46-35.bpo-33358._OcR59.rst b/Misc/NEWS.d/next/Tests/2018-04-27-11-46-35.bpo-33358._OcR59.rst new file mode 100644 index 000000000000..89406e994a91 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2018-04-27-11-46-35.bpo-33358._OcR59.rst @@ -0,0 +1,2 @@ +Fix ``test_embed.test_pre_initialization_sys_options()`` when the interpreter +is built with ``--enable-shared``.

1 0

bpo-33041: Fix downcast warning on Windows (#6595)
by Victor Stinner April 27, 2018

April 27, 2018

https://github.com/python/cpython/commit/078c4e3519deeef8014541925da057bb06… commit: 078c4e3519deeef8014541925da057bb064eb5a8 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-04-27T14:30:01+02:00 summary: bpo-33041: Fix downcast warning on Windows (#6595) Cast pointer difference from ssize_t to int: a frame is very unlikely larger than 2 GB. files: M Objects/frameobject.c diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 864a8f977ea3..14935a2147c4 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -297,7 +297,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) if (delta_iblock > 0) { f->f_iblock -= delta_iblock; PyTryBlock *b = &f->f_blockstack[f->f_iblock]; - delta += (f->f_stacktop - f->f_valuestack) - b->b_level; + delta += (int)(f->f_stacktop - f->f_valuestack) - b->b_level; if (b->b_type == SETUP_FINALLY && code[b->b_handler] == WITH_CLEANUP_START) {

1 0

bpo-33358: Fix test_embed.test_pre_initialization_sys_options (GH-6612)
by Victor Stinner April 27, 2018

April 27, 2018

https://github.com/python/cpython/commit/4114846265536344538ae44cb8ffd8ce29… commit: 4114846265536344538ae44cb8ffd8ce2903faf7 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: Victor Stinner <vstinner(a)redhat.com> date: 2018-04-27T14:23:13+02:00 summary: bpo-33358: Fix test_embed.test_pre_initialization_sys_options (GH-6612) Fix test_embed.test_pre_initialization_sys_options() when building with --enable-shared files: A Misc/NEWS.d/next/Tests/2018-04-27-11-46-35.bpo-33358._OcR59.rst M Lib/test/test_embed.py diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py index f926301b8466..c52cb9948782 100644 --- a/Lib/test/test_embed.py +++ b/Lib/test/test_embed.py @@ -208,7 +208,7 @@ def test_pre_initialization_sys_options(self): Checks that sys.warnoptions and sys._xoptions can be set before the runtime is initialized (otherwise they won't be effective). """ - env = dict(PYTHONPATH=os.pathsep.join(sys.path)) + env = dict(os.environ, PYTHONPATH=os.pathsep.join(sys.path)) out, err = self.run_embedded_interpreter( "pre_initialization_sys_options", env=env) expected_output = ( diff --git a/Misc/NEWS.d/next/Tests/2018-04-27-11-46-35.bpo-33358._OcR59.rst b/Misc/NEWS.d/next/Tests/2018-04-27-11-46-35.bpo-33358._OcR59.rst new file mode 100644 index 000000000000..89406e994a91 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2018-04-27-11-46-35.bpo-33358._OcR59.rst @@ -0,0 +1,2 @@ +Fix ``test_embed.test_pre_initialization_sys_options()`` when the interpreter +is built with ``--enable-shared``.

1 0

Daily reference leaks (4243df51fe43): sum=5
by solipsis＠pitrou.net April 27, 2018

April 27, 2018

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

1 0

Clarify the inspect.getmembers predicate parameter (#6615)
by Brian Curtin April 26, 2018

April 26, 2018

https://github.com/python/cpython/commit/df826f36e081211ef645a9025b60c4d84a… commit: df826f36e081211ef645a9025b60c4d84abb5419 branch: master author: Brian Curtin <brian(a)python.org> committer: GitHub <noreply(a)github.com> date: 2018-04-26T19:48:26-04:00 summary: Clarify the inspect.getmembers predicate parameter (#6615) Previously, the predicate parameter was mentioned, but what it was to be called with was not documented and required either trial-and-error or looking into the source to find that it is called with the `value`, or second item, of the full members list. This change addresses what the predicate will receive, as well as does some light formatting to make this clear. files: M Doc/library/inspect.rst diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst index bc4316fabaee..7db6ca68b23c 100644 --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -247,9 +247,10 @@ attributes: .. function:: getmembers(object[, predicate]) - Return all the members of an object in a list of (name, value) pairs sorted by - name. If the optional *predicate* argument is supplied, only members for which - the predicate returns a true value are included. + Return all the members of an object in a list of ``(name, value)`` + pairs sorted by name. If the optional *predicate* argument—which will be + called with the ``value`` object of each member—is supplied, only members + for which the predicate returns a true value are included. .. note::

1 0

[3.6] bpo-33280: Reorganize external Tcl/Tk references. (GH-6473). (#6602)
by Serhiy Storchaka April 26, 2018

April 26, 2018

https://github.com/python/cpython/commit/4533494ac553273239c809053b54c0ab78… commit: 4533494ac553273239c809053b54c0ab783a0c78 branch: 3.6 author: Andrés Delfino <adelfino(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-04-26T17:10:10+03:00 summary: [3.6] bpo-33280: Reorganize external Tcl/Tk references. (GH-6473). (#6602) (cherry picked from commit 67a8f4fed3169e1b8c947c10f6e06863e399ae32) Co-authored-by: Andrés Delfino <34587441+andresdelfino(a)users.noreply.github.com> files: M Doc/library/tkinter.rst diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index 8707a53d7ef8..d9c1c35aa294 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -13,12 +13,17 @@ The :mod:`tkinter` package ("Tk interface") is the standard Python interface to the Tk GUI toolkit. Both Tk and :mod:`tkinter` are available on most Unix platforms, as well as on Windows systems. (Tk itself is not part of Python; it -is maintained at ActiveState.) You can check that :mod:`tkinter` is properly -installed on your system by running ``python -m tkinter`` from the command line; -this should open a window demonstrating a simple Tk interface. +is maintained at ActiveState.) + +Running ``python -m tkinter`` from the command line should open a window +demonstrating a simple Tk interface, letting you know that :mod:`tkinter` is +properly installed on your system, and also showing what version of Tcl/Tk is +installed, so you can read the Tcl/Tk documentation specific to that version. .. seealso:: + Tkinter documentation: + `Python Tkinter Resources <https://wiki.python.org/moin/TkInter>`_ The Python Tkinter Topic Guide provides a great deal of information on using Tk from Python and links to other sources of information on Tk. @@ -32,17 +37,32 @@ this should open a window demonstrating a simple Tk interface. `Tkinter docs from effbot <http://effbot.org/tkinterbook/>`_ Online reference for tkinter supported by effbot.org. - `Tcl/Tk manual <https://www.tcl.tk/man/tcl8.5/>`_ - Official manual for the latest tcl/tk version. - - `Programming Python <http://learning-python.com/books/about-pp4e.html>`_ + `Programming Python <http://learning-python.com/about-pp4e.html>`_ Book by Mark Lutz, has excellent coverage of Tkinter. - `Modern Tkinter for Busy Python Developers <http://www.amazon.com/Modern-Tkinter-Python-Developers-ebook/dp/B0071QDNLO/>`_ + `Modern Tkinter for Busy Python Developers <https://www.amazon.com/Modern-Tkinter-Python-Developers-ebook/dp/B0071QDNLO/>`_ Book by Mark Rozerman about building attractive and modern graphical user interfaces with Python and Tkinter. `Python and Tkinter Programming <https://www.manning.com/books/python-and-tkinter-programming>`_ - The book by John Grayson (ISBN 1-884777-81-3). + Book by John Grayson (ISBN 1-884777-81-3). + + Tcl/Tk documentation: + + `Tk commands <https://www.tcl.tk/man/tcl8.6/TkCmd/contents.htm>`_ + Most commands are available as :mod:`tkinter` or :mod:`tkinter.ttk` classes. + Change '8.6' to match the version of your Tcl/Tk installation. + + `Tcl/Tk recent man pages <https://www.tcl.tk/doc/>`_ + Recent Tcl/Tk manuals on www.tcl.tk. + + `ActiveState Tcl Home Page <http://tcl.activestate.com/>`_ + The Tk/Tcl development is largely taking place at ActiveState. + + `Tcl and the Tk Toolkit <https://www.amazon.com/exec/obidos/ASIN/020163337X>`_ + Book by John Ousterhout, the inventor of Tcl. + + `Practical Programming in Tcl and Tk <http://www.beedub.com/book/>`_ + Brent Welch's encyclopedic book. Tkinter Modules @@ -175,21 +195,6 @@ documentation that exists. Here are some hints: place to go when nothing else makes sense. -.. seealso:: - - `Tcl/Tk 8.6 man pages <https://www.tcl.tk/man/tcl8.6/>`_ - The Tcl/Tk manual on www.tcl.tk. - - `ActiveState Tcl Home Page <http://tcl.activestate.com/>`_ - The Tk/Tcl development is largely taking place at ActiveState. - - `Tcl and the Tk Toolkit <http://www.amazon.com/exec/obidos/ASIN/020163337X>`_ - The book by John Ousterhout, the inventor of Tcl. - - `Practical Programming in Tcl and Tk <http://www.beedub.com/book/>`_ - Brent Welch's encyclopedic book. - - A Simple Hello World Program ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1 0

[2.7] bpo-33280: Reorganize external Tcl/Tk references. (GH-6473). (GH-6607)
by Serhiy Storchaka April 26, 2018

April 26, 2018

https://github.com/python/cpython/commit/1c6c8510f91fcd9d46a8ce9155d8c2689d… commit: 1c6c8510f91fcd9d46a8ce9155d8c2689d7df92b branch: 2.7 author: Andrés Delfino <adelfino(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-04-26T16:50:07+03:00 summary: [2.7] bpo-33280: Reorganize external Tcl/Tk references. (GH-6473). (GH-6607) (cherry picked from commit 67a8f4fed3169e1b8c947c10f6e06863e399ae32) Co-authored-by: Andrés Delfino <34587441+andresdelfino(a)users.noreply.github.com> files: M Doc/library/tkinter.rst diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index 5e07051168e8..3356e4ef23ec 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -11,6 +11,11 @@ the Tk GUI toolkit. Both Tk and :mod:`Tkinter` are available on most Unix platforms, as well as on Windows systems. (Tk itself is not part of Python; it is maintained at ActiveState.) +Running ``python -m Tkinter`` from the command line should open a window +demonstrating a simple Tk interface, letting you know that :mod:`Tkinter` is +properly installed on your system, and also showing what version of Tcl/Tk is +installed, so you can read the Tcl/Tk documentation specific to that version. + .. note:: :mod:`Tkinter` has been renamed to :mod:`tkinter` in Python 3. The @@ -19,6 +24,8 @@ is maintained at ActiveState.) .. seealso:: + Tkinter documentation: + `Python Tkinter Resources <https://wiki.python.org/moin/TkInter>`_ The Python Tkinter Topic Guide provides a great deal of information on using Tk from Python and links to other sources of information on Tk. @@ -32,17 +39,32 @@ is maintained at ActiveState.) `Tkinter docs from effbot <http://effbot.org/tkinterbook/>`_ Online reference for tkinter supported by effbot.org. - `Tcl/Tk manual <https://www.tcl.tk/man/tcl8.5/>`_ - Official manual for the latest tcl/tk version. - - `Programming Python <http://learning-python.com/books/about-pp4e.html>`_ + `Programming Python <http://learning-python.com/about-pp4e.html>`_ Book by Mark Lutz, has excellent coverage of Tkinter. - `Modern Tkinter for Busy Python Developers <http://www.amazon.com/Modern-Tkinter-Python-Developers-ebook/dp/B0071QDNLO/>`_ + `Modern Tkinter for Busy Python Developers <https://www.amazon.com/Modern-Tkinter-Python-Developers-ebook/dp/B0071QDNLO/>`_ Book by Mark Rozerman about building attractive and modern graphical user interfaces with Python and Tkinter. `Python and Tkinter Programming <https://www.manning.com/books/python-and-tkinter-programming>`_ - The book by John Grayson (ISBN 1-884777-81-3). + Book by John Grayson (ISBN 1-884777-81-3). + + Tcl/Tk documentation: + + `Tk commands <https://www.tcl.tk/man/tcl8.6/TkCmd/contents.htm>`_ + Most commands are available as :mod:`Tkinter` or :mod:`Tkinter.ttk` classes. + Change '8.6' to match the version of your Tcl/Tk installation. + + `Tcl/Tk recent man pages <https://www.tcl.tk/doc/>`_ + Recent Tcl/Tk manuals on www.tcl.tk. + + `ActiveState Tcl Home Page <http://tcl.activestate.com/>`_ + The Tk/Tcl development is largely taking place at ActiveState. + + `Tcl and the Tk Toolkit <https://www.amazon.com/exec/obidos/ASIN/020163337X>`_ + Book by John Ousterhout, the inventor of Tcl. + + `Practical Programming in Tcl and Tk <http://www.beedub.com/book/>`_ + Brent Welch's encyclopedic book. Tkinter Modules @@ -182,18 +204,6 @@ documentation that exists. Here are some hints: when nothing else makes sense. -.. seealso:: - - `ActiveState Tcl Home Page <http://tcl.activestate.com/>`_ - The Tk/Tcl development is largely taking place at ActiveState. - - `Tcl and the Tk Toolkit <http://www.amazon.com/exec/obidos/ASIN/020163337X>`_ - The book by John Ousterhout, the inventor of Tcl. - - `Practical Programming in Tcl and Tk <http://www.beedub.com/book/>`_ - Brent Welch's encyclopedic book. - - A Simple Hello World Program ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1 0

Daily reference leaks (4243df51fe43): sum=3
by solipsis＠pitrou.net April 26, 2018

April 26, 2018

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

1 0