diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-08 13:27:26 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-08 13:27:26 (GMT) |
| commit | 4886d246a89895a25c4733d537fdcfdede5e50f9 (patch) | |
| tree | fd5bb27951981da71f3319b2388eb4fd1d30bac5 /Doc | |
| parent | 81c867c3fc0719ec72ca3276be2327a6d1929a4b (diff) | |
| download | cpython-4886d246a89895a25c4733d537fdcfdede5e50f9.zip cpython-4886d246a89895a25c4733d537fdcfdede5e50f9.tar.gz cpython-4886d246a89895a25c4733d537fdcfdede5e50f9.tar.bz2 | |
Merged revisions 78736,78759,78761,78767,78788-78789 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78736 | florent.xicluna | 2010-03-06 20:43:41 +0100 (sam, 06 mar 2010) | 2 lines
Skip test_send_signal, test_kill, test_terminate on win32 platforms, for 2.7a4 release.
........
r78759 | florent.xicluna | 2010-03-07 13:21:36 +0100 (dim, 07 mar 2010) | 2 lines
#2777: Enable test_send_signal, test_terminate and test_kill on win32 platforms.
........
r78761 | florent.xicluna | 2010-03-07 16:27:39 +0100 (dim, 07 mar 2010) | 4 lines
Do not fail if returncode is 0 on send_signal/kill/terminate, for win32 platforms.
Do not hide the KeyboardInterrupt on POSIX platforms.
........
r78767 | florent.xicluna | 2010-03-07 18:12:23 +0100 (dim, 07 mar 2010) | 2 lines
#2777: Try hard to make Win7 buildbot happy...
........
r78788 | florent.xicluna | 2010-03-08 11:58:12 +0100 (lun, 08 mar 2010) | 2 lines
Fix syntax: "rc != None" -> "rc is not None"
........
r78789 | florent.xicluna | 2010-03-08 11:59:33 +0100 (lun, 08 mar 2010) | 2 lines
Replace the stderr logging with assertNotEqual(returncode, 0).
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/subprocess.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index e6f91b1..a7df536 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -534,7 +534,7 @@ Return code handling translates as follows:: pipe = os.popen(cmd, 'w') ... rc = pipe.close() - if rc != None and rc % 256: + if rc is not None and rc % 256: print("There were some errors") ==> process = Popen(cmd, 'w', stdin=PIPE) |