diff options
author | Benjamin Peterson <benjamin@python.org> | 2012-10-09 15:16:13 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2012-10-09 15:16:13 (GMT) |
commit | 29e02a2be8d5e3e0e9967c5806b15965201bb7aa (patch) | |
tree | c44ab2fe883c85cb8a87222ef465e5c253c723e1 /Lib/os.py | |
parent | 2bc53a092a78b6e49c1e3f497eb7512810e83c0c (diff) | |
parent | b29614e047110f4d9af993a6cdec4e3fb7ef9738 (diff) | |
download | cpython-29e02a2be8d5e3e0e9967c5806b15965201bb7aa.zip cpython-29e02a2be8d5e3e0e9967c5806b15965201bb7aa.tar.gz cpython-29e02a2be8d5e3e0e9967c5806b15965201bb7aa.tar.bz2 |
merge 3.3
Diffstat (limited to 'Lib/os.py')
-rw-r--r-- | Lib/os.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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": |