Mailman 3 April 2018 - Python-checkins

bpo-33330: Improve error handling in PyImport_Cleanup(). (GH-6564)
by Serhiy Storchaka April 25, 2018

April 25, 2018

https://github.com/python/cpython/commit/e9d9494d6b2a5e0c2d48d22c7f0d5e9550… commit: e9d9494d6b2a5e0c2d48d22c7f0d5e95504b4f7e branch: master author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-04-25T20:58:40+03:00 summary: bpo-33330: Improve error handling in PyImport_Cleanup(). (GH-6564) files: M Python/import.c diff --git a/Python/import.c b/Python/import.c index 9f46da336234..c29eb7b9415b 100644 --- a/Python/import.c +++ b/Python/import.c @@ -364,7 +364,7 @@ PyImport_GetModule(PyObject *name) } else { m = PyObject_GetItem(modules, name); - if (PyErr_ExceptionMatches(PyExc_KeyError)) { + if (m == NULL && PyErr_ExceptionMatches(PyExc_KeyError)) { PyErr_Clear(); } } @@ -416,12 +416,16 @@ PyImport_Cleanup(void) if (Py_VerboseFlag) PySys_WriteStderr("# clear builtins._\n"); - PyDict_SetItemString(interp->builtins, "_", Py_None); + if (PyDict_SetItemString(interp->builtins, "_", Py_None) < 0) { + PyErr_Clear(); + } for (p = sys_deletes; *p != NULL; p++) { if (Py_VerboseFlag) PySys_WriteStderr("# clear sys.%s\n", *p); - PyDict_SetItemString(interp->sysdict, *p, Py_None); + if (PyDict_SetItemString(interp->sysdict, *p, Py_None) < 0) { + PyErr_Clear(); + } } for (p = sys_files; *p != NULL; p+=2) { if (Py_VerboseFlag) @@ -429,7 +433,9 @@ PyImport_Cleanup(void) value = PyDict_GetItemString(interp->sysdict, *(p+1)); if (value == NULL) value = Py_None; - PyDict_SetItemString(interp->sysdict, *p, value); + if (PyDict_SetItemString(interp->sysdict, *p, value) < 0) { + PyErr_Clear(); + } } /* We prepare a list which will receive (name, weakref) tuples of @@ -443,21 +449,26 @@ PyImport_Cleanup(void) #define STORE_MODULE_WEAKREF(name, mod) \ if (weaklist != NULL) { \ PyObject *wr = PyWeakref_NewRef(mod, NULL); \ - if (name && wr) { \ + if (wr) { \ PyObject *tup = PyTuple_Pack(2, name, wr); \ - PyList_Append(weaklist, tup); \ + if (!tup || PyList_Append(weaklist, tup) < 0) { \ + PyErr_Clear(); \ + } \ Py_XDECREF(tup); \ + Py_DECREF(wr); \ } \ - Py_XDECREF(wr); \ - if (PyErr_Occurred()) \ + else { \ PyErr_Clear(); \ + } \ } #define CLEAR_MODULE(name, mod) \ if (PyModule_Check(mod)) { \ if (Py_VerboseFlag && PyUnicode_Check(name)) \ PySys_FormatStderr("# cleanup[2] removing %U\n", name); \ STORE_MODULE_WEAKREF(name, mod); \ - PyObject_SetItem(modules, name, Py_None); \ + if (PyObject_SetItem(modules, name, Py_None) < 0) { \ + PyErr_Clear(); \ + } \ } /* Remove all modules from sys.modules, hoping that garbage collection @@ -484,6 +495,9 @@ PyImport_Cleanup(void) Py_DECREF(value); Py_DECREF(key); } + if (PyErr_Occurred()) { + PyErr_Clear(); + } Py_DECREF(iterator); } } @@ -564,6 +578,7 @@ PyImport_Cleanup(void) /* Once more */ _PyGC_CollectNoFail(); +#undef CLEAR_MODULE #undef STORE_MODULE_WEAKREF }

1 0

bpo-33280: Reorganize external Tcl/Tk references. (GH-6473)
by Serhiy Storchaka April 25, 2018

April 25, 2018

https://github.com/python/cpython/commit/67a8f4fed3169e1b8c947c10f6e06863e3… commit: 67a8f4fed3169e1b8c947c10f6e06863e399ae32 branch: master author: Andrés Delfino <34587441+andresdelfino(a)users.noreply.github.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-04-25T20:53:58+03:00 summary: bpo-33280: Reorganize external Tcl/Tk references. (GH-6473) files: M Doc/library/tkinter.rst diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index a6a2e473d3d6..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,9 +37,6 @@ 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/about-pp4e.html>`_ Book by Mark Lutz, has excellent coverage of Tkinter. @@ -42,7 +44,25 @@ this should open a window demonstrating a simple Tk interface. 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 <https://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

Mention both relevant PEPs in function annotations tutorial (GH-6304)
by Zachary Ware April 25, 2018

April 25, 2018

https://github.com/python/cpython/commit/643ff711faf417fc3428897dc7d36250ad… commit: 643ff711faf417fc3428897dc7d36250ad2cb0e5 branch: master author: Neeraj Badlani <neerajbadlani(a)gmail.com> committer: Zachary Ware <zachary.ware(a)gmail.com> date: 2018-04-25T12:52:13-05:00 summary: Mention both relevant PEPs in function annotations tutorial (GH-6304) Patch by Neeraj Badlani. files: M Doc/tutorial/controlflow.rst diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst index 30ef159f8b36..4bcdafd73352 100644 --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -678,8 +678,8 @@ Function Annotations single: -> (return annotation assignment) :ref:`Function annotations <function>` are completely optional metadata -information about the types used by user-defined functions (see :pep:`484` -for more information). +information about the types used by user-defined functions (see :pep:`3107` and +:pep:`484` for more information). Annotations are stored in the :attr:`__annotations__` attribute of the function as a dictionary and have no effect on any other part of the function. Parameter

1 0

Fix rendering issues in the documentation for the os module (#6525)
by Serhiy Storchaka April 25, 2018

April 25, 2018

https://github.com/python/cpython/commit/d6ef6db9ff780efb2cd502a54ca208afbe… commit: d6ef6db9ff780efb2cd502a54ca208afbe84af9c branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-04-25T20:48:27+03:00 summary: Fix rendering issues in the documentation for the os module (#6525) files: M Doc/library/os.rst diff --git a/Doc/library/os.rst b/Doc/library/os.rst index d269d0b0eaa6..2f3b31edd5d7 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1126,18 +1126,24 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo .. versionadded:: 3.7 -.. data:: RWF_DSYNC (since Linux 4.7) +.. data:: RWF_DSYNC + Provide a per-write equivalent of the O_DSYNC open(2) flag. This flag is meaningful only for pwritev2(), and its effect applies only to the data range written by the system call. + Availability: Linux (version 4.7). + .. versionadded:: 3.7 -.. data:: RWF_SYNC (since Linux 4.7) +.. data:: RWF_SYNC + Provide a per-write equivalent of the O_SYNC open(2) flag. This flag is meaningful only for pwritev2(), and its effect applies only to the data range written by the system call. + Availability: Linux (version 4.7). + .. versionadded:: 3.7 @@ -1260,16 +1266,20 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo .. versionadded:: 3.7 -.. data:: RWF_HIPRI (since Linux 4.6) +.. data:: RWF_HIPRI + High priority read/write. Allows block-based filesystems to use polling of the device, which provides lower latency, but may use additional resources. (Currently, this feature is usable only on a file descriptor opened using the O_DIRECT flag.) + Availability: Linux (version 4.6). + .. versionadded:: 3.7 -.. data:: RWF_NOWAIT (since Linux 4.14) +.. data:: RWF_NOWAIT + Do not wait for data which is not immediately available. If this flag is specified, the preadv2() system call will return instantly if it would have to read data from the backing storage or wait for a lock. @@ -1277,6 +1287,8 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo read. If no bytes were read, it will return -1 and set errno to EAGAIN. Currently, this flag is meaningful only for preadv2(). + Availability: Linux (version 4.14). + .. versionadded:: 3.7

1 0

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

April 25, 2018

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

1 0

bpo-33128 Fix duplicated call to importlib._install_external_importers (GH-6273)
by Miss Islington (bot) April 25, 2018

April 25, 2018

https://github.com/python/cpython/commit/52a5a17338dfa7fed259027e1ecceba9c8… commit: 52a5a17338dfa7fed259027e1ecceba9c8491189 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-24T19:48:04-07:00 summary: bpo-33128 Fix duplicated call to importlib._install_external_importers (GH-6273) External importers were being added in both phases of the import system initialisation. They're only supposed to be added in the second phase, after the import machinery has been appropriately configured. (cherry picked from commit 0977091dca59709864b14cfc129388f1f0de7bf7) Co-authored-by: Pablo Galindo <Pablogsal(a)gmail.com> files: A Misc/NEWS.d/next/Core and Builtins/2018-04-24-22-31-04.bpo-33128.g2yLuf.rst M Lib/test/test_sys.py M Python/pylifecycle.c diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 6933b41353bd..336ae447a8de 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -852,6 +852,9 @@ def check(tracebacklimit, expected): check(-1<<1000, [traceback[-1]]) check(None, traceback) + def test_no_duplicates_in_meta_path(self): + self.assertEqual(len(sys.meta_path), len(set(sys.meta_path))) + @test.support.cpython_only class SizeofTest(unittest.TestCase): diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-24-22-31-04.bpo-33128.g2yLuf.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-24-22-31-04.bpo-33128.g2yLuf.rst new file mode 100644 index 000000000000..66b98cdf51cf --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-24-22-31-04.bpo-33128.g2yLuf.rst @@ -0,0 +1,2 @@ +Fix a bug that causes PathFinder to appear twice on sys.meta_path. Patch by +Pablo Galindo Salgado. diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 5db586e15dff..2ef96f8d99ef 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -325,11 +325,6 @@ initimport(PyInterpreterState *interp, PyObject *sysmod) /* Install importlib as the implementation of import */ value = PyObject_CallMethod(importlib, "_install", "OO", sysmod, impmod); - if (value != NULL) { - Py_DECREF(value); - value = PyObject_CallMethod(importlib, - "_install_external_importers", ""); - } if (value == NULL) { PyErr_Print(); return _Py_INIT_ERR("importlib install failed");

1 0

bpo-33128 Fix duplicated call to importlib._install_external_importers (GH-6273)
by Nick Coghlan April 25, 2018

April 25, 2018

https://github.com/python/cpython/commit/0977091dca59709864b14cfc129388f1f0… commit: 0977091dca59709864b14cfc129388f1f0de7bf7 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: Nick Coghlan <ncoghlan(a)gmail.com> date: 2018-04-25T12:22:28+10:00 summary: bpo-33128 Fix duplicated call to importlib._install_external_importers (GH-6273) External importers were being added in both phases of the import system initialisation. They're only supposed to be added in the second phase, after the import machinery has been appropriately configured. files: A Misc/NEWS.d/next/Core and Builtins/2018-04-24-22-31-04.bpo-33128.g2yLuf.rst M Lib/test/test_sys.py M Python/pylifecycle.c diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 6933b41353bd..336ae447a8de 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -852,6 +852,9 @@ def check(tracebacklimit, expected): check(-1<<1000, [traceback[-1]]) check(None, traceback) + def test_no_duplicates_in_meta_path(self): + self.assertEqual(len(sys.meta_path), len(set(sys.meta_path))) + @test.support.cpython_only class SizeofTest(unittest.TestCase): diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-24-22-31-04.bpo-33128.g2yLuf.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-24-22-31-04.bpo-33128.g2yLuf.rst new file mode 100644 index 000000000000..66b98cdf51cf --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-24-22-31-04.bpo-33128.g2yLuf.rst @@ -0,0 +1,2 @@ +Fix a bug that causes PathFinder to appear twice on sys.meta_path. Patch by +Pablo Galindo Salgado. diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index a9b9470c7265..958219b74458 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -325,11 +325,6 @@ initimport(PyInterpreterState *interp, PyObject *sysmod) /* Install importlib as the implementation of import */ value = PyObject_CallMethod(importlib, "_install", "OO", sysmod, impmod); - if (value != NULL) { - Py_DECREF(value); - value = PyObject_CallMethod(importlib, - "_install_external_importers", ""); - } if (value == NULL) { PyErr_Print(); return _Py_INIT_ERR("importlib install failed");

1 0

travis: Use -O3 option (GH-5599)
by INADA Naoki April 25, 2018

April 25, 2018

https://github.com/python/cpython/commit/730fb07c3c5f3e11be9d35efa710272290… commit: 730fb07c3c5f3e11be9d35efa71027229072778f branch: 2.7 author: INADA Naoki <methane(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-25T10:28:06+09:00 summary: travis: Use -O3 option (GH-5599) We don't use debugger on Travis. (cherry picked from commit 8ff53564730f7ba503f5ad94418c309c48e8516d) files: M .travis.yml diff --git a/.travis.yml b/.travis.yml index 175432dd45ab..695b5a7d81a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,11 @@ cache: - pip - ccache +env: + global: + # Use -O3 because we don't use debugger on Travis-CI + - CFLAGS="-O3" + branches: only: - master

1 0

travis: Use -O3 option (GH-5599)
by INADA Naoki April 25, 2018

April 25, 2018

https://github.com/python/cpython/commit/38e8936eed3d50b39629d4719fd836966c… commit: 38e8936eed3d50b39629d4719fd836966c1517f2 branch: 3.6 author: INADA Naoki <methane(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-25T10:27:18+09:00 summary: travis: Use -O3 option (GH-5599) We don't use debugger on Travis.. (cherry picked from commit 8ff53564730f7ba503f5ad94418c309c48e8516d) Co-authored-by: INADA Naoki <methane(a)users.noreply.github.com> files: M .travis.yml diff --git a/.travis.yml b/.travis.yml index 7d92c2e2f852..2ced4d0b97f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,11 @@ cache: - pip - ccache +env: + global: + # Use -O3 because we don't use debugger on Travis-CI + - CFLAGS="-O3" + branches: only: - master

1 0

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

April 24, 2018

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

1 0