mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #28746: Merge 3.6

Browse source
This commit is contained in:
Xavier de Gaye 2016-11-19 16:20:31 +01:00
commit 002d61fea7
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -10,6 +10,9 @@ What's New in Python 3.7.0 alpha 1
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #28746: Fix the set_inheritable() file descriptor method on platforms
that do not have the ioctl FIOCLEX and FIONCLEX commands.
- Issue #26920: Fix not getting the locale's charset upon initializing the - Issue #26920: Fix not getting the locale's charset upon initializing the
interpreter, on platforms that do not have langinfo. interpreter, on platforms that do not have langinfo.

2
Python/fileutils.c
View file

@ -886,7 +886,7 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works)
return 0; return 0;
} }
res = fcntl(fd, F_SETFD, flags); res = fcntl(fd, F_SETFD, new_flags);
if (res < 0) { if (res < 0) {
if (raise) if (raise)
PyErr_SetFromErrno(PyExc_OSError); PyErr_SetFromErrno(PyExc_OSError);