branch merge 3.2

1 files changed, 3 insertions, 1 deletions

diff --git a/Lib/os.py b/Lib/os.py
index 3ef3db8ae0..a894ee0f2c 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -779,11 +779,13 @@ if not _exists("urandom"):
         return bs
 
 # Supply os.popen()
-def popen(cmd, mode="r", buffering=None):
+def popen(cmd, mode="r", buffering=-1):
     if not isinstance(cmd, str):
         raise TypeError("invalid cmd type (%s, expected string)" % type(cmd))
     if mode not in ("r", "w"):
         raise ValueError("invalid mode %r" % mode)
+    if buffering == 0 or buffering == None:
+        raise ValueError("popen() does not support unbuffered streams")
     import subprocess, io
     if mode == "r":
         proc = subprocess.Popen(cmd,