diff options
| author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-08-19 17:49:39 (GMT) |
|---|---|---|
| committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-08-19 17:49:39 (GMT) |
| commit | 377a152e0dab743b165236024f50602a325d8b93 (patch) | |
| tree | af3a6dc153785b088fc5732a059379e958fcbf3a /Lib/subprocess.py | |
| parent | a86f18537441c8828caa49cf60a8349acd05deac (diff) | |
| download | cpython-377a152e0dab743b165236024f50602a325d8b93.zip cpython-377a152e0dab743b165236024f50602a325d8b93.tar.gz cpython-377a152e0dab743b165236024f50602a325d8b93.tar.bz2 | |
Use Thread.is_alive() instead of old-style Thread.isAlive() in subprocess.
Diffstat (limited to 'Lib/subprocess.py')
| -rw-r--r-- | Lib/subprocess.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py index d9f14fa..249b5f6 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -1188,11 +1188,11 @@ class Popen(object): # calls communicate again. if self.stdout is not None: self.stdout_thread.join(self._remaining_time(endtime)) - if self.stdout_thread.isAlive(): + if self.stdout_thread.is_alive(): raise TimeoutExpired(self.args, orig_timeout) if self.stderr is not None: self.stderr_thread.join(self._remaining_time(endtime)) - if self.stderr_thread.isAlive(): + if self.stderr_thread.is_alive(): raise TimeoutExpired(self.args, orig_timeout) # Collect the output from and close both pipes, now that we know |