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/portage/dbapi | |
| 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/portage/dbapi')
| -rw-r--r-- | pym/portage/dbapi/_MergeProcess.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py index a9cc2b32f..469ba0b3a 100644 --- a/pym/portage/dbapi/_MergeProcess.py +++ b/pym/portage/dbapi/_MergeProcess.py @@ -90,7 +90,7 @@ class MergeProcess(ForkProcess): reporter(msg, phase=phase, key=key, out=out) if event & self.scheduler.IO_HUP: - self.scheduler.unregister(self._elog_reg_id) + self.scheduler.source_remove(self._elog_reg_id) self._elog_reg_id = None os.close(self._elog_reader_fd) self._elog_reader_fd = None @@ -119,7 +119,7 @@ class MergeProcess(ForkProcess): blockers=blockers, scheduler=self.scheduler, pipe=elog_writer_fd) fd_pipes[elog_writer_fd] = elog_writer_fd - self._elog_reg_id = self.scheduler.register(elog_reader_fd, + self._elog_reg_id = self.scheduler.io_add_watch(elog_reader_fd, self._registered_events, self._elog_output_handler) # If a concurrent emerge process tries to install a package @@ -231,7 +231,7 @@ class MergeProcess(ForkProcess): self._unlock_vdb() if self._elog_reg_id is not None: - self.scheduler.unregister(self._elog_reg_id) + self.scheduler.source_remove(self._elog_reg_id) self._elog_reg_id = None if self._elog_reader_fd is not None: os.close(self._elog_reader_fd) |