diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-02-11 20:08:59 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-02-11 20:08:59 -0800 |
| commit | fc42d39d0ac9043b7a480d914b12fa679e4e2785 (patch) | |
| tree | 68b7cb000ff1fd30ee233daa18d8d8b4217e4990 | |
| parent | b3cfb2065ccbeb8f769d630ff997c0327fb2eb35 (diff) | |
| download | portage-fc42d39d0ac9043b7a480d914b12fa679e4e2785.tar.gz portage-fc42d39d0ac9043b7a480d914b12fa679e4e2785.tar.bz2 portage-fc42d39d0ac9043b7a480d914b12fa679e4e2785.zip | |
AbstractPollTask: merge _wait from subclass
| -rw-r--r-- | pym/_emerge/AbstractPollTask.py | 6 | ||||
| -rw-r--r-- | 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: |