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.

1 files changed, 4 insertions, 4 deletions

diff --git a/pym/_emerge/FifoIpcDaemon.py b/pym/_emerge/FifoIpcDaemon.py
index de9dc67b1..959c00769 100644
--- a/pym/_emerge/FifoIpcDaemon.py
+++ b/pym/_emerge/FifoIpcDaemon.py
@@ -21,7 +21,7 @@ class FifoIpcDaemon(AbstractPollTask):
 		self._files.pipe_in = \
 			os.open(self.input_fifo, os.O_RDONLY|os.O_NONBLOCK)
 
-		self._reg_id = self.scheduler.register(
+		self._reg_id = self.scheduler.io_add_watch(
 			self._files.pipe_in,
 			self._registered_events, self._input_handler)
 
@@ -32,11 +32,11 @@ class FifoIpcDaemon(AbstractPollTask):
 		Re-open the input stream, in order to suppress
 		POLLHUP events (bug #339976).
 		"""
-		self.scheduler.unregister(self._reg_id)
+		self.scheduler.source_remove(self._reg_id)
 		os.close(self._files.pipe_in)
 		self._files.pipe_in = \
 			os.open(self.input_fifo, os.O_RDONLY|os.O_NONBLOCK)
-		self._reg_id = self.scheduler.register(
+		self._reg_id = self.scheduler.io_add_watch(
 			self._files.pipe_in,
 			self._registered_events, self._input_handler)
 
@@ -69,7 +69,7 @@ class FifoIpcDaemon(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: