From fc42d39d0ac9043b7a480d914b12fa679e4e2785 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 11 Feb 2012 20:08:59 -0800 Subject: AbstractPollTask: merge _wait from subclass --- pym/_emerge/AbstractPollTask.py | 6 ++++++ pym/_emerge/AsynchronousLock.py | 12 ------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pym/_emerge/AbstractPollTask.py b/pym/_emerge/AbstractPollTask.py index 68282efb5..af1c3ffe8 100644 --- a/pym/_emerge/AbstractPollTask.py +++ b/pym/_emerge/AbstractPollTask.py @@ -127,6 +127,12 @@ class AbstractPollTask(AsynchronousTask): self._unregister() self.wait() + def _wait(self): + if self.returncode is not None: + return self.returncode + self._wait_loop() + return self.returncode + def _wait_loop(self, timeout=None): if timeout is None: diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py index c07df0bdd..587aa4650 100644 --- a/pym/_emerge/AsynchronousLock.py +++ b/pym/_emerge/AsynchronousLock.py @@ -148,12 +148,6 @@ class _LockThread(AbstractPollTask): # There's currently no way to force thread termination. pass - def _wait(self): - if self.returncode is not None: - return self.returncode - self._wait_loop() - return self.returncode - def unlock(self): if self._lock_obj is None: raise AssertionError('not locked') @@ -259,12 +253,6 @@ class _LockProcess(AbstractPollTask): self._proc.poll() return self.returncode - def _wait(self): - if self.returncode is not None: - return self.returncode - self._wait_loop() - return self.returncode - def _output_handler(self, f, event): buf = None if event & self.scheduler.IO_IN: -- cgit v1.2.3-1-g7c22