Mailman 3 January 2019 - Python-checkins

bpo-32710: Fix leak in Overlapped_WSASend() (GH-11469)
by Miss Islington (bot) Jan. 8, 2019

Jan. 8, 2019

https://github.com/python/cpython/commit/88ad48bc98980a40591cc5521703dbb0ad… commit: 88ad48bc98980a40591cc5521703dbb0ad3a9b17 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-08T05:40:50-08:00 summary: bpo-32710: Fix leak in Overlapped_WSASend() (GH-11469) Fix a memory leak in asyncio in the ProactorEventLoop when ReadFile() or WSASend() overlapped operation fail immediately: release the internal buffer. (cherry picked from commit a234e148394c2c7419372ab65b773d53a57f3625) Co-authored-by: Victor Stinner <vstinner(a)redhat.com> files: A Misc/NEWS.d/next/Library/2019-01-08-14-00-52.bpo-32710.Sn5Ujj.rst M Modules/overlapped.c diff --git a/Misc/NEWS.d/next/Library/2019-01-08-14-00-52.bpo-32710.Sn5Ujj.rst b/Misc/NEWS.d/next/Library/2019-01-08-14-00-52.bpo-32710.Sn5Ujj.rst new file mode 100644 index 000000000000..5c3961c33d96 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-08-14-00-52.bpo-32710.Sn5Ujj.rst @@ -0,0 +1,3 @@ +Fix a memory leak in asyncio in the ProactorEventLoop when ``ReadFile()`` or +``WSASend()`` overlapped operation fail immediately: release the internal +buffer. diff --git a/Modules/overlapped.c b/Modules/overlapped.c index ae7cddadd02d..4ef5a96b1e4d 100644 --- a/Modules/overlapped.c +++ b/Modules/overlapped.c @@ -723,6 +723,7 @@ do_ReadFile(OverlappedObject *self, HANDLE handle, case ERROR_IO_PENDING: Py_RETURN_NONE; default: + PyBuffer_Release(&self->user_buffer); self->type = TYPE_NOT_STARTED; return SetFromWindowsErr(err); } @@ -1011,6 +1012,7 @@ Overlapped_WSASend(OverlappedObject *self, PyObject *args) case ERROR_IO_PENDING: Py_RETURN_NONE; default: + PyBuffer_Release(&self->user_buffer); self->type = TYPE_NOT_STARTED; return SetFromWindowsErr(err); }

1 0

bpo-32710: Fix leak in Overlapped_WSASend() (GH-11469)
by Victor Stinner Jan. 8, 2019

Jan. 8, 2019

https://github.com/python/cpython/commit/a234e148394c2c7419372ab65b773d53a5… commit: a234e148394c2c7419372ab65b773d53a57f3625 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2019-01-08T14:23:09+01:00 summary: bpo-32710: Fix leak in Overlapped_WSASend() (GH-11469) Fix a memory leak in asyncio in the ProactorEventLoop when ReadFile() or WSASend() overlapped operation fail immediately: release the internal buffer. files: A Misc/NEWS.d/next/Library/2019-01-08-14-00-52.bpo-32710.Sn5Ujj.rst M Modules/overlapped.c diff --git a/Misc/NEWS.d/next/Library/2019-01-08-14-00-52.bpo-32710.Sn5Ujj.rst b/Misc/NEWS.d/next/Library/2019-01-08-14-00-52.bpo-32710.Sn5Ujj.rst new file mode 100644 index 000000000000..5c3961c33d96 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-08-14-00-52.bpo-32710.Sn5Ujj.rst @@ -0,0 +1,3 @@ +Fix a memory leak in asyncio in the ProactorEventLoop when ``ReadFile()`` or +``WSASend()`` overlapped operation fail immediately: release the internal +buffer. diff --git a/Modules/overlapped.c b/Modules/overlapped.c index 69875a7f37da..bbaa4fb3008f 100644 --- a/Modules/overlapped.c +++ b/Modules/overlapped.c @@ -723,6 +723,7 @@ do_ReadFile(OverlappedObject *self, HANDLE handle, case ERROR_IO_PENDING: Py_RETURN_NONE; default: + PyBuffer_Release(&self->user_buffer); self->type = TYPE_NOT_STARTED; return SetFromWindowsErr(err); } @@ -1011,6 +1012,7 @@ Overlapped_WSASend(OverlappedObject *self, PyObject *args) case ERROR_IO_PENDING: Py_RETURN_NONE; default: + PyBuffer_Release(&self->user_buffer); self->type = TYPE_NOT_STARTED; return SetFromWindowsErr(err); }

1 0

bpo-35596: Use unchecked PYCs for the embeddable distro to avoid zipimport restrictions (GH-11465)
by Miss Islington (bot) Jan. 8, 2019

Jan. 8, 2019

https://github.com/python/cpython/commit/69f64b67e43c65c2178c865fd1be80ed07… commit: 69f64b67e43c65c2178c865fd1be80ed07f02d3c branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-08T02:56:14-08:00 summary: bpo-35596: Use unchecked PYCs for the embeddable distro to avoid zipimport restrictions (GH-11465) Also adds extra steps to the CI build for Windows on Azure Pipelines to validate that the various layouts at least execute. (cherry picked from commit 872bd2b57ce8e4ea7a54acb3934222c0e4e7276b) Co-authored-by: Steve Dower <steve.dower(a)microsoft.com> files: A .azure-pipelines/windows-layout-steps.yml A Misc/NEWS.d/next/Windows/2019-01-08-13-56-01.bpo-35596.oFvhcm.rst M .azure-pipelines/ci.yml M PC/layout/main.py diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index 49a7bb6232aa..78075bcfc147 100644 --- a/.azure-pipelines/ci.yml +++ b/.azure-pipelines/ci.yml @@ -134,3 +134,13 @@ jobs: steps: - template: ./windows-steps.yml + + - template: ./windows-layout-steps.yml + parameters: + kind: nuget + - template: ./windows-layout-steps.yml + parameters: + kind: embed + - template: ./windows-layout-steps.yml + parameters: + kind: appx diff --git a/.azure-pipelines/windows-layout-steps.yml b/.azure-pipelines/windows-layout-steps.yml new file mode 100644 index 000000000000..62e5259375f5 --- /dev/null +++ b/.azure-pipelines/windows-layout-steps.yml @@ -0,0 +1,11 @@ +parameters: + kind: nuget + extraOpts: --precompile + +steps: +- script: .\python.bat PC\layout -vv -s "$(Build.SourcesDirectory)" -b "$(Py_OutDir)\$(arch)" -t "$(Py_IntDir)\layout-tmp-${{ parameters['kind'] }}-$(arch)" --copy "$(Py_OutDir)\layout-${{ parameters['kind'] }}-$(arch)" ${{ parameters['extraOpts'] }} --preset-${{ parameters['kind'] }} --include-tests + displayName: Create ${{ parameters['kind'] }} layout + +- script: .\python.exe -m test.pythoninfo + workingDirectory: $(Py_OutDir)\layout-${{ parameters['kind'] }}-$(arch) + displayName: Show layout info (${{ parameters['kind'] }}) diff --git a/Misc/NEWS.d/next/Windows/2019-01-08-13-56-01.bpo-35596.oFvhcm.rst b/Misc/NEWS.d/next/Windows/2019-01-08-13-56-01.bpo-35596.oFvhcm.rst new file mode 100644 index 000000000000..db4d8fa420d6 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-01-08-13-56-01.bpo-35596.oFvhcm.rst @@ -0,0 +1,2 @@ +Use unchecked PYCs for the embeddable distro to avoid zipimport +restrictions. diff --git a/PC/layout/main.py b/PC/layout/main.py index 7eaf201d532e..d372fe50df32 100644 --- a/PC/layout/main.py +++ b/PC/layout/main.py @@ -240,12 +240,18 @@ def _c(d): yield "DLLs/{}".format(ns.include_cat.name), ns.include_cat -def _compile_one_py(src, dest, name, optimize): +def _compile_one_py(src, dest, name, optimize, checked=True): import py_compile if dest is not None: dest = str(dest) + mode = ( + py_compile.PycInvalidationMode.CHECKED_HASH + if checked + else py_compile.PycInvalidationMode.UNCHECKED_HASH + ) + try: return Path( py_compile.compile( @@ -254,7 +260,7 @@ def _compile_one_py(src, dest, name, optimize): str(name), doraise=True, optimize=optimize, - invalidation_mode=py_compile.PycInvalidationMode.CHECKED_HASH, + invalidation_mode=mode, ) ) except py_compile.PyCompileError: @@ -262,16 +268,16 @@ def _compile_one_py(src, dest, name, optimize): return None -def _py_temp_compile(src, ns, dest_dir=None): +def _py_temp_compile(src, ns, dest_dir=None, checked=True): if not ns.precompile or src not in PY_FILES or src.parent in DATA_DIRS: return None dest = (dest_dir or ns.temp) / (src.stem + ".py") - return _compile_one_py(src, dest.with_suffix(".pyc"), dest, optimize=2) + return _compile_one_py(src, dest.with_suffix(".pyc"), dest, optimize=2, checked=checked) -def _write_to_zip(zf, dest, src, ns): - pyc = _py_temp_compile(src, ns) +def _write_to_zip(zf, dest, src, ns, checked=True): + pyc = _py_temp_compile(src, ns, checked=checked) if pyc: try: zf.write(str(pyc), dest.with_suffix(".pyc")) @@ -321,7 +327,7 @@ def generate_source_files(ns): ns.temp.mkdir(parents=True, exist_ok=True) with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zf: for dest, src in get_lib_layout(ns): - _write_to_zip(zf, dest, src, ns) + _write_to_zip(zf, dest, src, ns, checked=False) if ns.include_underpth: log_info("Generating {} in {}", PYTHON_PTH_NAME, ns.temp)

1 0

bpo-35596: Use unchecked PYCs for the embeddable distro to avoid zipimport restrictions (GH-11465)
by Steve Dower Jan. 8, 2019

Jan. 8, 2019

https://github.com/python/cpython/commit/872bd2b57ce8e4ea7a54acb3934222c0e4… commit: 872bd2b57ce8e4ea7a54acb3934222c0e4e7276b branch: master author: Steve Dower <steve.dower(a)microsoft.com> committer: GitHub <noreply(a)github.com> date: 2019-01-08T02:38:01-08:00 summary: bpo-35596: Use unchecked PYCs for the embeddable distro to avoid zipimport restrictions (GH-11465) Also adds extra steps to the CI build for Windows on Azure Pipelines to validate that the various layouts at least execute. files: A .azure-pipelines/windows-layout-steps.yml A Misc/NEWS.d/next/Windows/2019-01-08-13-56-01.bpo-35596.oFvhcm.rst M .azure-pipelines/ci.yml M PC/layout/main.py diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index 49a7bb6232aa..78075bcfc147 100644 --- a/.azure-pipelines/ci.yml +++ b/.azure-pipelines/ci.yml @@ -134,3 +134,13 @@ jobs: steps: - template: ./windows-steps.yml + + - template: ./windows-layout-steps.yml + parameters: + kind: nuget + - template: ./windows-layout-steps.yml + parameters: + kind: embed + - template: ./windows-layout-steps.yml + parameters: + kind: appx diff --git a/.azure-pipelines/windows-layout-steps.yml b/.azure-pipelines/windows-layout-steps.yml new file mode 100644 index 000000000000..62e5259375f5 --- /dev/null +++ b/.azure-pipelines/windows-layout-steps.yml @@ -0,0 +1,11 @@ +parameters: + kind: nuget + extraOpts: --precompile + +steps: +- script: .\python.bat PC\layout -vv -s "$(Build.SourcesDirectory)" -b "$(Py_OutDir)\$(arch)" -t "$(Py_IntDir)\layout-tmp-${{ parameters['kind'] }}-$(arch)" --copy "$(Py_OutDir)\layout-${{ parameters['kind'] }}-$(arch)" ${{ parameters['extraOpts'] }} --preset-${{ parameters['kind'] }} --include-tests + displayName: Create ${{ parameters['kind'] }} layout + +- script: .\python.exe -m test.pythoninfo + workingDirectory: $(Py_OutDir)\layout-${{ parameters['kind'] }}-$(arch) + displayName: Show layout info (${{ parameters['kind'] }}) diff --git a/Misc/NEWS.d/next/Windows/2019-01-08-13-56-01.bpo-35596.oFvhcm.rst b/Misc/NEWS.d/next/Windows/2019-01-08-13-56-01.bpo-35596.oFvhcm.rst new file mode 100644 index 000000000000..db4d8fa420d6 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-01-08-13-56-01.bpo-35596.oFvhcm.rst @@ -0,0 +1,2 @@ +Use unchecked PYCs for the embeddable distro to avoid zipimport +restrictions. diff --git a/PC/layout/main.py b/PC/layout/main.py index 7eaf201d532e..d372fe50df32 100644 --- a/PC/layout/main.py +++ b/PC/layout/main.py @@ -240,12 +240,18 @@ def _c(d): yield "DLLs/{}".format(ns.include_cat.name), ns.include_cat -def _compile_one_py(src, dest, name, optimize): +def _compile_one_py(src, dest, name, optimize, checked=True): import py_compile if dest is not None: dest = str(dest) + mode = ( + py_compile.PycInvalidationMode.CHECKED_HASH + if checked + else py_compile.PycInvalidationMode.UNCHECKED_HASH + ) + try: return Path( py_compile.compile( @@ -254,7 +260,7 @@ def _compile_one_py(src, dest, name, optimize): str(name), doraise=True, optimize=optimize, - invalidation_mode=py_compile.PycInvalidationMode.CHECKED_HASH, + invalidation_mode=mode, ) ) except py_compile.PyCompileError: @@ -262,16 +268,16 @@ def _compile_one_py(src, dest, name, optimize): return None -def _py_temp_compile(src, ns, dest_dir=None): +def _py_temp_compile(src, ns, dest_dir=None, checked=True): if not ns.precompile or src not in PY_FILES or src.parent in DATA_DIRS: return None dest = (dest_dir or ns.temp) / (src.stem + ".py") - return _compile_one_py(src, dest.with_suffix(".pyc"), dest, optimize=2) + return _compile_one_py(src, dest.with_suffix(".pyc"), dest, optimize=2, checked=checked) -def _write_to_zip(zf, dest, src, ns): - pyc = _py_temp_compile(src, ns) +def _write_to_zip(zf, dest, src, ns, checked=True): + pyc = _py_temp_compile(src, ns, checked=checked) if pyc: try: zf.write(str(pyc), dest.with_suffix(".pyc")) @@ -321,7 +327,7 @@ def generate_source_files(ns): ns.temp.mkdir(parents=True, exist_ok=True) with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zf: for dest, src in get_lib_layout(ns): - _write_to_zip(zf, dest, src, ns) + _write_to_zip(zf, dest, src, ns, checked=False) if ns.include_underpth: log_info("Generating {} in {}", PYTHON_PTH_NAME, ns.temp)

1 0

bpo-35568: add 'raise_signal' function (GH-11335)
by Miss Islington (bot) Jan. 8, 2019

Jan. 8, 2019

https://github.com/python/cpython/commit/c24c6c2c9357da99961bf2570782405291… commit: c24c6c2c9357da99961bf257078240529181daf3 branch: master author: Vladimir Matveev <v2matveev(a)outlook.com> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-01-08T01:58:25-08:00 summary: bpo-35568: add 'raise_signal' function (GH-11335) As in title, expose C `raise` function as `raise_function` in `signal` module. Also drop existing `raise_signal` in `_testcapi` module and replace all usages with new function. https://bugs.python.org/issue35568 files: A Misc/NEWS.d/next/Library/2018-12-27-19-23-00.bpo-35568.PutiOC.rst M Doc/library/signal.rst M Lib/test/test_asyncio/test_windows_events.py M Lib/test/test_faulthandler.py M Lib/test/test_posix.py M Lib/test/test_regrtest.py M Lib/test/test_signal.py M Modules/_testcapimodule.c M Modules/clinic/signalmodule.c.h M Modules/signalmodule.c diff --git a/Doc/library/signal.rst b/Doc/library/signal.rst index 5c48c88f08df..ac6cad9aff8e 100644 --- a/Doc/library/signal.rst +++ b/Doc/library/signal.rst @@ -237,6 +237,13 @@ The :mod:`signal` module defines the following functions: :func:`sigpending`. +.. function:: raise_signal(signum) + + Sends a signal to the calling process. Returns nothing. + + .. versionadded:: 3.8 + + .. function:: pthread_kill(thread_id, signalnum) Send the signal *signalnum* to the thread *thread_id*, another thread in the diff --git a/Lib/test/test_asyncio/test_windows_events.py b/Lib/test/test_asyncio/test_windows_events.py index a200a8a80ad9..05f85159be0c 100644 --- a/Lib/test/test_asyncio/test_windows_events.py +++ b/Lib/test/test_asyncio/test_windows_events.py @@ -45,7 +45,7 @@ def test_ctrl_c(self): def SIGINT_after_delay(): time.sleep(1) - _testcapi.raise_signal(signal.SIGINT) + signal.raise_signal(signal.SIGINT) asyncio.set_event_loop_policy(asyncio.WindowsProactorEventLoopPolicy()) l = asyncio.get_event_loop() diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py index 6aee22be2e03..f0be91844ffa 100644 --- a/Lib/test/test_faulthandler.py +++ b/Lib/test/test_faulthandler.py @@ -198,14 +198,13 @@ def test_sigfpe(self): @skip_segfault_on_android def test_sigbus(self): self.check_fatal_error(""" - import _testcapi import faulthandler import signal faulthandler.enable() - _testcapi.raise_signal(signal.SIGBUS) + signal.raise_signal(signal.SIGBUS) """, - 6, + 5, 'Bus error') @unittest.skipIf(_testcapi is None, 'need _testcapi') @@ -213,14 +212,13 @@ def test_sigbus(self): @skip_segfault_on_android def test_sigill(self): self.check_fatal_error(""" - import _testcapi import faulthandler import signal faulthandler.enable() - _testcapi.raise_signal(signal.SIGILL) + signal.raise_signal(signal.SIGILL) """, - 6, + 5, 'Illegal instruction') def test_fatal_error(self): diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index 86c04b9f324a..d7e512c99f03 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -1596,8 +1596,8 @@ def test_setpgroup_wrong_type(self): 'need signal.pthread_sigmask()') def test_setsigmask(self): code = textwrap.dedent("""\ - import _testcapi, signal - _testcapi.raise_signal(signal.SIGUSR1)""") + import signal + signal.raise_signal(signal.SIGUSR1)""") pid = posix.posix_spawn( sys.executable, @@ -1627,8 +1627,8 @@ def test_setsigmask_wrong_type(self): def test_setsigdef(self): original_handler = signal.signal(signal.SIGUSR1, signal.SIG_IGN) code = textwrap.dedent("""\ - import _testcapi, signal - _testcapi.raise_signal(signal.SIGUSR1)""") + import signal + signal.raise_signal(signal.SIGUSR1)""") try: pid = posix.posix_spawn( sys.executable, diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index a67458313add..61937767ec12 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -26,9 +26,8 @@ ROOT_DIR = os.path.abspath(os.path.normpath(ROOT_DIR)) TEST_INTERRUPTED = textwrap.dedent(""" - from signal import SIGINT + from signal import SIGINT, raise_signal try: - from _testcapi import raise_signal raise_signal(SIGINT) except ImportError: import os diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index b10faa010b2b..2a6217ef6432 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -1,3 +1,4 @@ +import errno import os import random import signal @@ -254,7 +255,7 @@ def handler(signum, frame): signal.set_wakeup_fd(r) try: with captured_stderr() as err: - _testcapi.raise_signal(signal.SIGALRM) + signal.raise_signal(signal.SIGALRM) except ZeroDivisionError: # An ignored exception should have been printed out on stderr err = err.getvalue() @@ -348,10 +349,9 @@ def handler(signum, frame): def test_signum(self): self.check_wakeup("""def test(): - import _testcapi signal.signal(signal.SIGUSR1, handler) - _testcapi.raise_signal(signal.SIGUSR1) - _testcapi.raise_signal(signal.SIGALRM) + signal.raise_signal(signal.SIGUSR1) + signal.raise_signal(signal.SIGALRM) """, signal.SIGUSR1, signal.SIGALRM) @unittest.skipUnless(hasattr(signal, 'pthread_sigmask'), @@ -365,8 +365,8 @@ def test_pending(self): signal.signal(signum2, handler) signal.pthread_sigmask(signal.SIG_BLOCK, (signum1, signum2)) - _testcapi.raise_signal(signum1) - _testcapi.raise_signal(signum2) + signal.raise_signal(signum1) + signal.raise_signal(signum2) # Unblocking the 2 signals calls the C signal handler twice signal.pthread_sigmask(signal.SIG_UNBLOCK, (signum1, signum2)) """, signal.SIGUSR1, signal.SIGUSR2, ordered=False) @@ -396,7 +396,7 @@ def handler(signum, frame): write.setblocking(False) signal.set_wakeup_fd(write.fileno()) - _testcapi.raise_signal(signum) + signal.raise_signal(signum) data = read.recv(1) if not data: @@ -445,7 +445,7 @@ def handler(signum, frame): write.close() with captured_stderr() as err: - _testcapi.raise_signal(signum) + signal.raise_signal(signum) err = err.getvalue() if ('Exception ignored when trying to {action} to the signal wakeup fd' @@ -519,7 +519,7 @@ def handler(signum, frame): signal.set_wakeup_fd(write.fileno()) with captured_stderr() as err: - _testcapi.raise_signal(signum) + signal.raise_signal(signum) err = err.getvalue() if msg not in err: @@ -530,7 +530,7 @@ def handler(signum, frame): signal.set_wakeup_fd(write.fileno(), warn_on_full_buffer=True) with captured_stderr() as err: - _testcapi.raise_signal(signum) + signal.raise_signal(signum) err = err.getvalue() if msg not in err: @@ -541,7 +541,7 @@ def handler(signum, frame): signal.set_wakeup_fd(write.fileno(), warn_on_full_buffer=False) with captured_stderr() as err: - _testcapi.raise_signal(signum) + signal.raise_signal(signum) err = err.getvalue() if err != "": @@ -553,7 +553,7 @@ def handler(signum, frame): signal.set_wakeup_fd(write.fileno()) with captured_stderr() as err: - _testcapi.raise_signal(signum) + signal.raise_signal(signum) err = err.getvalue() if msg not in err: @@ -1214,6 +1214,38 @@ def handler(signum, frame): # Python handler self.assertEqual(len(sigs), N, "Some signals were lost") +class RaiseSignalTest(unittest.TestCase): + + def test_sigint(self): + try: + signal.raise_signal(signal.SIGINT) + self.fail("Expected KeyInterrupt") + except KeyboardInterrupt: + pass + + @unittest.skipIf(sys.platform != "win32", "Windows specific test") + def test_invalid_argument(self): + try: + SIGHUP = 1 # not supported on win32 + signal.raise_signal(SIGHUP) + self.fail("OSError (Invalid argument) expected") + except OSError as e: + if e.errno == errno.EINVAL: + pass + else: + raise + + def test_handler(self): + is_ok = False + def handler(a, b): + nonlocal is_ok + is_ok = True + old_signal = signal.signal(signal.SIGINT, handler) + self.addCleanup(signal.signal, signal.SIGINT, old_signal) + + signal.raise_signal(signal.SIGINT) + self.assertTrue(is_ok) + def tearDownModule(): support.reap_children() diff --git a/Misc/NEWS.d/next/Library/2018-12-27-19-23-00.bpo-35568.PutiOC.rst b/Misc/NEWS.d/next/Library/2018-12-27-19-23-00.bpo-35568.PutiOC.rst new file mode 100644 index 000000000000..d70806404f87 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-12-27-19-23-00.bpo-35568.PutiOC.rst @@ -0,0 +1 @@ +Expose ``raise(signum)`` as `raise_signal` diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 4933ef3b61c4..85810f30b1c5 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -3859,25 +3859,6 @@ call_in_temporary_c_thread(PyObject *self, PyObject *callback) return res; } -static PyObject* -test_raise_signal(PyObject* self, PyObject *args) -{ - int signum, err; - - if (!PyArg_ParseTuple(args, "i:raise_signal", &signum)) { - return NULL; - } - - err = raise(signum); - if (err) - return PyErr_SetFromErrno(PyExc_OSError); - - if (PyErr_CheckSignals() < 0) - return NULL; - - Py_RETURN_NONE; -} - /* marshal */ static PyObject* @@ -4908,8 +4889,6 @@ static PyMethodDef TestMethods[] = { {"docstring_with_signature_with_defaults", (PyCFunction)test_with_docstring, METH_NOARGS, docstring_with_signature_with_defaults}, - {"raise_signal", - (PyCFunction)test_raise_signal, METH_VARARGS}, {"call_in_temporary_c_thread", call_in_temporary_c_thread, METH_O, PyDoc_STR("set_error_class(error_class) -> None")}, {"pymarshal_write_long_to_file", diff --git a/Modules/clinic/signalmodule.c.h b/Modules/clinic/signalmodule.c.h index 6745f45ef751..f3742262d867 100644 --- a/Modules/clinic/signalmodule.c.h +++ b/Modules/clinic/signalmodule.c.h @@ -66,6 +66,39 @@ signal_pause(PyObject *module, PyObject *Py_UNUSED(ignored)) #endif /* defined(HAVE_PAUSE) */ +PyDoc_STRVAR(signal_raise_signal__doc__, +"raise_signal($module, signalnum, /)\n" +"--\n" +"\n" +"Send a signal to the executing process."); + +#define SIGNAL_RAISE_SIGNAL_METHODDEF \ + {"raise_signal", (PyCFunction)signal_raise_signal, METH_O, signal_raise_signal__doc__}, + +static PyObject * +signal_raise_signal_impl(PyObject *module, int signalnum); + +static PyObject * +signal_raise_signal(PyObject *module, PyObject *arg) +{ + PyObject *return_value = NULL; + int signalnum; + + if (PyFloat_Check(arg)) { + PyErr_SetString(PyExc_TypeError, + "integer argument expected, got float" ); + goto exit; + } + signalnum = _PyLong_AsInt(arg); + if (signalnum == -1 && PyErr_Occurred()) { + goto exit; + } + return_value = signal_raise_signal_impl(module, signalnum); + +exit: + return return_value; +} + PyDoc_STRVAR(signal_signal__doc__, "signal($module, signalnum, handler, /)\n" "--\n" @@ -558,4 +591,4 @@ signal_pthread_kill(PyObject *module, PyObject *const *args, Py_ssize_t nargs) #ifndef SIGNAL_PTHREAD_KILL_METHODDEF #define SIGNAL_PTHREAD_KILL_METHODDEF #endif /* !defined(SIGNAL_PTHREAD_KILL_METHODDEF) */ -/*[clinic end generated code: output=4ed8c36860f9f577 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=365db4e807c26d4e input=a9049054013a1b77]*/ diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 52ab4e998a97..4f8f71a0a1df 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -390,6 +390,31 @@ signal_pause_impl(PyObject *module) #endif +/*[clinic input] +signal.raise_signal + + signalnum: int + / + +Send a signal to the executing process. +[clinic start generated code]*/ + +static PyObject * +signal_raise_signal_impl(PyObject *module, int signalnum) +/*[clinic end generated code: output=e2b014220aa6111d input=e90c0f9a42358de6]*/ +{ + int err; + Py_BEGIN_ALLOW_THREADS + _Py_BEGIN_SUPPRESS_IPH + err = raise(signalnum); + _Py_END_SUPPRESS_IPH + Py_END_ALLOW_THREADS + + if (err) { + return PyErr_SetFromErrno(PyExc_OSError); + } + Py_RETURN_NONE; +} /*[clinic input] signal.signal @@ -1208,6 +1233,7 @@ static PyMethodDef signal_methods[] = { SIGNAL_SETITIMER_METHODDEF SIGNAL_GETITIMER_METHODDEF SIGNAL_SIGNAL_METHODDEF + SIGNAL_RAISE_SIGNAL_METHODDEF SIGNAL_STRSIGNAL_METHODDEF SIGNAL_GETSIGNAL_METHODDEF {"set_wakeup_fd", (PyCFunction)(void(*)(void))signal_set_wakeup_fd, METH_VARARGS | METH_KEYWORDS, set_wakeup_fd_doc},

1 0

Daily reference leaks (4243df51fe43): sum=3
by solipsis＠pitrou.net Jan. 8, 2019

Jan. 8, 2019

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

1 0

bpo-35374: Avoid trailing space in hhc file name if found on PATH. (GH-10849)
by Miss Islington (bot) Jan. 7, 2019

Jan. 7, 2019

https://github.com/python/cpython/commit/5d1e0124cf562153a681d1b5b362e7c8e2… commit: 5d1e0124cf562153a681d1b5b362e7c8e23edea9 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-07T19:04:14-08:00 summary: bpo-35374: Avoid trailing space in hhc file name if found on PATH. (GH-10849) (cherry picked from commit e61cc481e02b758c8d8289163102c236d0658a55) Co-authored-by: chrullrich <chris(a)chrullrich.net> files: M Doc/make.bat diff --git a/Doc/make.bat b/Doc/make.bat index 461c35c5a114..e6604956ea91 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -41,7 +41,7 @@ if exist "%HTMLHELP%" goto :skiphhcsearch rem Search for HHC in likely places set HTMLHELP= -where hhc /q && set HTMLHELP=hhc && goto :skiphhcsearch +where hhc /q && set "HTMLHELP=hhc" && goto :skiphhcsearch where /R ..\externals hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" if not exist "%HTMLHELP%" where /R "%ProgramFiles(x86)%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" if not exist "%HTMLHELP%" where /R "%ProgramFiles%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"

1 0

bpo-35374: Avoid trailing space in hhc file name if found on PATH. (GH-10849)
by Steve Dower Jan. 7, 2019

Jan. 7, 2019

https://github.com/python/cpython/commit/e61cc481e02b758c8d8289163102c236d0… commit: e61cc481e02b758c8d8289163102c236d0658a55 branch: master author: chrullrich <chris(a)chrullrich.net> committer: Steve Dower <steve.dower(a)microsoft.com> date: 2019-01-07T18:57:29-08:00 summary: bpo-35374: Avoid trailing space in hhc file name if found on PATH. (GH-10849) files: M Doc/make.bat diff --git a/Doc/make.bat b/Doc/make.bat index 461c35c5a114..e6604956ea91 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -41,7 +41,7 @@ if exist "%HTMLHELP%" goto :skiphhcsearch rem Search for HHC in likely places set HTMLHELP= -where hhc /q && set HTMLHELP=hhc && goto :skiphhcsearch +where hhc /q && set "HTMLHELP=hhc" && goto :skiphhcsearch where /R ..\externals hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" if not exist "%HTMLHELP%" where /R "%ProgramFiles(x86)%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" if not exist "%HTMLHELP%" where /R "%ProgramFiles%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"

1 0

bpo-35682: Fix _ProactorBasePipeTransport._force_close() (GH-11462)
by Miss Islington (bot) Jan. 7, 2019

Jan. 7, 2019

https://github.com/python/cpython/commit/88bd26a72eb4ab341cf19bea78a0039fbe… commit: 88bd26a72eb4ab341cf19bea78a0039fbe4be3a2 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-07T18:15:25-08:00 summary: bpo-35682: Fix _ProactorBasePipeTransport._force_close() (GH-11462) bpo-32622, bpo-35682: Fix asyncio.ProactorEventLoop.sendfile(): don't attempt to set the result of an internal future if it's already done. Fix asyncio _ProactorBasePipeTransport._force_close(): don't set the result of _empty_waiter if it's already done. (cherry picked from commit 80fda712c83f5dd9560d42bf2aa65a72b18b7759) Co-authored-by: Victor Stinner <vstinner(a)redhat.com> files: A Misc/NEWS.d/next/Library/2019-01-08-01-54-02.bpo-35682.KDM9lk.rst M Lib/asyncio/proactor_events.py diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py index e350e8bc0c24..782c86106bce 100644 --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -110,7 +110,7 @@ def _fatal_error(self, exc, message='Fatal error on pipe transport'): self._force_close(exc) def _force_close(self, exc): - if self._empty_waiter is not None: + if self._empty_waiter is not None and not self._empty_waiter.done(): if exc is None: self._empty_waiter.set_result(None) else: diff --git a/Misc/NEWS.d/next/Library/2019-01-08-01-54-02.bpo-35682.KDM9lk.rst b/Misc/NEWS.d/next/Library/2019-01-08-01-54-02.bpo-35682.KDM9lk.rst new file mode 100644 index 000000000000..8152bd707ba5 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-08-01-54-02.bpo-35682.KDM9lk.rst @@ -0,0 +1,2 @@ +Fix ``asyncio.ProactorEventLoop.sendfile()``: don't attempt to set the result +of an internal future if it's already done.

1 0

Remove spurious quote in Azure Pipelines script (GH-10763)
by Steve Dower Jan. 7, 2019

Jan. 7, 2019

https://github.com/python/cpython/commit/202d1bde8f0d8854c7cba5ed2d93b46997… commit: 202d1bde8f0d8854c7cba5ed2d93b469972b57cf branch: master author: Pierre Glaser <pierreglaser(a)msn.com> committer: Steve Dower <steve.dower(a)microsoft.com> date: 2019-01-07T18:02:26-08:00 summary: Remove spurious quote in Azure Pipelines script (GH-10763) files: M .azure-pipelines/posix-steps.yml diff --git a/.azure-pipelines/posix-steps.yml b/.azure-pipelines/posix-steps.yml index 9fec9be8014f..6e2606fff7bc 100644 --- a/.azure-pipelines/posix-steps.yml +++ b/.azure-pipelines/posix-steps.yml @@ -26,7 +26,7 @@ steps: xvfb-run ./venv/bin/python -m coverage run --pylib -m test \ --fail-env-changed \ -uall,-cpu \ - --junit-xml=$(build.binariesDirectory)/test-results.xml" \ + --junit-xml=$(build.binariesDirectory)/test-results.xml \ -x test_multiprocessing_fork \ -x test_multiprocessing_forkserver \ -x test_multiprocessing_spawn \

1 0