merge 3.3

This commit is contained in:
Benjamin Peterson 2012-10-09 11:16:13 -04:00
commit 29e02a2be8
10 changed files with 17 additions and 21 deletions

View file

@ -961,7 +961,7 @@ def popen(cmd, mode="r", buffering=-1):
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:
if buffering == 0 or buffering is None:
raise ValueError("popen() does not support unbuffered streams")
import subprocess, io
if mode == "r":