AbstractPollTask: merge _wait from subclass

diff --git a/pym/_emerge/AbstractPollTask.py b/pym/_emerge/AbstractPollTask.py
index 68282efb5b1855287c99fa5eb08441f78131c71e..af1c3ffe819f014a16943446d1842678cb43cc1e 100644 (file)
--- 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 c07df0bddbde1ec217caa0becd929d92268b5835..587aa4650ea8ceb8f6165468ae3d810d0427553b 100644 (file)
--- 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: