From: David Herberth <github@dav1d.de>
Date: Fri, 19 Oct 2018 22:32:04 +0000 (+0200)
Subject: bpo-34070: open() only checks for isatty if buffering < 0 (GH-8187)
X-Git-Tag: v3.8.0a1~735
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8deab9672554edaf58f91e238cc899463d53f6ea;p=thirdparty%2FPython%2Fcpython.git

bpo-34070: open() only checks for isatty if buffering < 0 (GH-8187)
---

diff --git a/Misc/NEWS.d/next/Library/2018-07-11-20-51-20.bpo-34070.WpmFAu.rst b/Misc/NEWS.d/next/Library/2018-07-11-20-51-20.bpo-34070.WpmFAu.rst
new file mode 100644
index 000000000000..0088c62c0ffb
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-07-11-20-51-20.bpo-34070.WpmFAu.rst
@@ -0,0 +1,2 @@
+Make sure to only check if the handle is a tty, when opening
+a file with ``buffering=-1``.
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
index 0d8a638f40cf..eedca011d2ed 100644
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -241,7 +241,7 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode,
 
     char rawmode[6], *m;
     int line_buffering, is_number;
-    long isatty;
+    long isatty = 0;
 
     PyObject *raw, *modeobj = NULL, *buffer, *wrapper, *result = NULL, *path_or_fd = NULL;
 
@@ -388,7 +388,7 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode,
         goto error;
 
     /* buffering */
-    {
+    if (buffering < 0) {
         PyObject *res = _PyObject_CallMethodId(raw, &PyId_isatty, NULL);
         if (res == NULL)
             goto error;
@@ -398,7 +398,7 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode,
             goto error;
     }
 
-    if (buffering == 1 || (buffering < 0 && isatty)) {
+    if (buffering == 1 || isatty) {
         buffering = -1;
         line_buffering = 1;
     }