mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 19:34:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge from 3.6

Browse source
This commit is contained in:
Steve Dower 2016-11-19 18:41:31 -08:00
commit 1325ee0938
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -622,6 +622,8 @@ Core and Builtins
Library Library
------- -------
- Issue #28732: Fix crash in os.spawnv() with no elements in args
- Issue #28485: Always raise ValueError for negative - Issue #28485: Always raise ValueError for negative
compileall.compile_dir(workers=...) parameter, even when multithreading is compileall.compile_dir(workers=...) parameter, even when multithreading is
unavailable. unavailable.

9
Modules/posixmodule.c
View file

@ -3347,8 +3347,7 @@ os_link_impl(PyObject *module, path_t *src, path_t *dst, int src_dir_fd,
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
if (src->wide) result = CreateHardLinkW(dst->wide, src->wide, NULL);
result = CreateHardLinkW(dst->wide, src->wide, NULL);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (!result) if (!result)
@ -4111,7 +4110,9 @@ os_system_impl(PyObject *module, Py_UNICODE *command)
{ {
long result; long result;
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
_Py_BEGIN_SUPPRESS_IPH
result = _wsystem(command); result = _wsystem(command);
_Py_END_SUPPRESS_IPH
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
return result; return result;
} }
@ -6889,7 +6890,9 @@ os_waitpid_impl(PyObject *module, intptr_t pid, int options)
do { do {
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
_Py_BEGIN_SUPPRESS_IPH
res = _cwait(&status, pid, options); res = _cwait(&status, pid, options);
_Py_END_SUPPRESS_IPH
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
} while (res < 0 && errno == EINTR && !(async_err = PyErr_CheckSignals())); } while (res < 0 && errno == EINTR && !(async_err = PyErr_CheckSignals()));
if (res < 0) if (res < 0)
@ -8256,6 +8259,7 @@ os_pipe_impl(PyObject *module)
attr.bInheritHandle = FALSE; attr.bInheritHandle = FALSE;
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
_Py_BEGIN_SUPPRESS_IPH
ok = CreatePipe(&read, &write, &attr, 0); ok = CreatePipe(&read, &write, &attr, 0);
if (ok) { if (ok) {
fds[0] = _open_osfhandle((intptr_t)read, _O_RDONLY); fds[0] = _open_osfhandle((intptr_t)read, _O_RDONLY);
@ -8266,6 +8270,7 @@ os_pipe_impl(PyObject *module)
ok = 0; ok = 0;
} }
} }
_Py_END_SUPPRESS_IPH
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (!ok) if (!ok)