procutil: split if condition
authorManuel Jacob <me@manueljacob.de>
Fri, 10 Jul 2020 09:59:36 +0200
changeset 45080 00cdac669614
parent 45079 8628cd1122d2
child 45081 29a905fe23ae
procutil: split if condition This prepares the code for subsequent changes where we need to differentiate between the two cases.
mercurial/utils/procutil.py
--- a/mercurial/utils/procutil.py	Fri Jul 10 09:55:38 2020 +0200
+++ b/mercurial/utils/procutil.py	Fri Jul 10 09:59:36 2020 +0200
@@ -98,9 +98,11 @@
 # destined stdout with a pipe destined stdout (e.g. pager), we want line
 # buffering.
 if isatty(stdout):
-    if pycompat.ispy3 or pycompat.iswindows:
+    if pycompat.ispy3:
         # Python 3 implements its own I/O streams.
         # The standard library doesn't offer line-buffered binary streams.
+        stdout = make_line_buffered(stdout)
+    elif pycompat.iswindows:
         # Python 2 uses the I/O streams provided by the C library.
         # The Windows C runtime library doesn't support line buffering.
         stdout = make_line_buffered(stdout)