diff options
| author | Gregory P. Smith <greg@krypto.org> | 2015-04-07 22:57:54 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2015-04-07 22:57:54 (GMT) |
| commit | ace55865c5a528d4d2711c468c5da649fa20c4b1 (patch) | |
| tree | ea7c26c8da7ca150d9ccc2a1e0625b03b8988bf2 /Lib/subprocess.py | |
| parent | 3c28878e401400c6a51edd84d6d550c42e9441b6 (diff) | |
| download | cpython-ace55865c5a528d4d2711c468c5da649fa20c4b1.zip cpython-ace55865c5a528d4d2711c468c5da649fa20c4b1.tar.gz cpython-ace55865c5a528d4d2711c468c5da649fa20c4b1.tar.bz2 | |
Addresses Issue #10838: The subprocess now module includes
SubprocessError and TimeoutError in its list of exported names for the
users wild enough to use "from subprocess import *".
MAXFD, mswindows and list2cmdline should be dealt with (renamed or
moved) in separate commits.
Committed at 35,000ft. Thanks chromebook free gogo wifi passes!
Diffstat (limited to 'Lib/subprocess.py')
| -rw-r--r-- | Lib/subprocess.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 6d2c4f5..1c7eb9e 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -433,7 +433,10 @@ else: __all__ = ["Popen", "PIPE", "STDOUT", "call", "check_call", "getstatusoutput", - "getoutput", "check_output", "CalledProcessError", "DEVNULL"] + "getoutput", "check_output", "CalledProcessError", "DEVNULL", + "SubprocessError", "TimeoutExpired"] + # NOTE: We intentionally exclude list2cmdline as it is + # considered an internal implementation detail. issue10838. if mswindows: from _winapi import (CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP, |