summaryrefslogtreecommitdiffstats
path: root/Lib/os.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-10-09 15:16:13 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-10-09 15:16:13 (GMT)
commit29e02a2be8d5e3e0e9967c5806b15965201bb7aa (patch)
treec44ab2fe883c85cb8a87222ef465e5c253c723e1 /Lib/os.py
parent2bc53a092a78b6e49c1e3f497eb7512810e83c0c (diff)
parentb29614e047110f4d9af993a6cdec4e3fb7ef9738 (diff)
downloadcpython-29e02a2be8d5e3e0e9967c5806b15965201bb7aa.zip
cpython-29e02a2be8d5e3e0e9967c5806b15965201bb7aa.tar.gz
cpython-29e02a2be8d5e3e0e9967c5806b15965201bb7aa.tar.bz2
merge 3.3
Diffstat (limited to 'Lib/os.py')
-rw-r--r--Lib/os.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/os.py b/Lib/os.py
index c31df81..8241f36 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -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":