[Python-checkins] cpython (merge 3.6 -> default): Issue #28746: Merge 3.6

[xavier.degaye]

https://hg.python.org/cpython/rev/3248782c3176
changeset:   105187:3248782c3176
parent:      105185:7c98768368cb
parent:      105186:2fb2e3dc450e
user:        Xavier de Gaye <xdegaye at users.sourceforge.net>
date:        Sat Nov 19 16:20:31 2016 +0100
summary:
  Issue #28746: Merge 3.6

files:
  Misc/NEWS          |  3 +++
  Python/fileutils.c |  2 +-
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 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
   interpreter, on platforms that do not have langinfo.
 
diff --git a/Python/fileutils.c b/Python/fileutils.c
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -886,7 +886,7 @@
         return 0;
     }
 
-    res = fcntl(fd, F_SETFD, flags);
+    res = fcntl(fd, F_SETFD, new_flags);
     if (res < 0) {
         if (raise)
             PyErr_SetFromErrno(PyExc_OSError);

-- 
Repository URL: https://hg.python.org/cpython