Commit 377a152e authored by Andrew Svetlov's avatar Andrew Svetlov

Use Thread.is_alive() instead of old-style Thread.isAlive() in subprocess.

parent a86f1853
...@@ -1188,11 +1188,11 @@ class Popen(object): ...@@ -1188,11 +1188,11 @@ class Popen(object):
# calls communicate again. # calls communicate again.
if self.stdout is not None: if self.stdout is not None:
self.stdout_thread.join(self._remaining_time(endtime)) 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) raise TimeoutExpired(self.args, orig_timeout)
if self.stderr is not None: if self.stderr is not None:
self.stderr_thread.join(self._remaining_time(endtime)) 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) raise TimeoutExpired(self.args, orig_timeout)
# Collect the output from and close both pipes, now that we know # Collect the output from and close both pipes, now that we know
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment