diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-10-05 21:31:56 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-10-05 21:31:56 -0700 |
commit | 14230dd467c4f0136cb99e83f2d610de166b772b (patch) | |
tree | cbc1f254b884fa8b006436a2af3c78a8426facb7 /pym/_emerge/AsynchronousLock.py | |
parent | 637bb91a9439d4bb7f391fe6e804b64592812fdd (diff) | |
download | portage-14230dd467c4f0136cb99e83f2d610de166b772b.tar.gz portage-14230dd467c4f0136cb99e83f2d610de166b772b.tar.bz2 portage-14230dd467c4f0136cb99e83f2d610de166b772b.zip |
PollScheduler: remove register/unregister methods
These methods were aliases for the EventLoop io_add_watch and
source_remove methods. Migrating to the EventLoop method names allows
an EventLoop instance to substitute for a PollScheduler inside
subclasses of AbstractPollTask.
Diffstat (limited to 'pym/_emerge/AsynchronousLock.py')
-rw-r--r-- | pym/_emerge/AsynchronousLock.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py index 587aa4650..6e2d9bd28 100644 --- a/pym/_emerge/AsynchronousLock.py +++ b/pym/_emerge/AsynchronousLock.py @@ -116,7 +116,7 @@ class _LockThread(AbstractPollTask): for f in self._files.values(): fcntl.fcntl(f, fcntl.F_SETFL, fcntl.fcntl(f, fcntl.F_GETFL) | os.O_NONBLOCK) - self._reg_id = self.scheduler.register(self._files['pipe_read'], + self._reg_id = self.scheduler.io_add_watch(self._files['pipe_read'], self.scheduler.IO_IN, self._output_handler) self._registered = True threading_mod = threading @@ -164,7 +164,7 @@ class _LockThread(AbstractPollTask): self._thread = None if self._reg_id is not None: - self.scheduler.unregister(self._reg_id) + self.scheduler.source_remove(self._reg_id) self._reg_id = None if self._files is not None: @@ -192,7 +192,7 @@ class _LockProcess(AbstractPollTask): self._files['pipe_out'] = out_pw fcntl.fcntl(in_pr, fcntl.F_SETFL, fcntl.fcntl(in_pr, fcntl.F_GETFL) | os.O_NONBLOCK) - self._reg_id = self.scheduler.register(in_pr, + self._reg_id = self.scheduler.io_add_watch(in_pr, self.scheduler.IO_IN, self._output_handler) self._registered = True self._proc = SpawnProcess( @@ -273,7 +273,7 @@ class _LockProcess(AbstractPollTask): self._registered = False if self._reg_id is not None: - self.scheduler.unregister(self._reg_id) + self.scheduler.source_remove(self._reg_id) self._reg_id = None if self._files is not None: |