From 963fa653fc0d7aff25bb4756df8398b88193547c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 9 Feb 2012 16:41:14 -0800 Subject: EventLoop: name poll constants like glib's It's conceivable the constants could be implementation dependent, so use glib's generic IO_* names rather than the POLL* names which are associated specifically with python's select.poll object. --- pym/portage/util/_eventloop/EventLoop.py | 9 ++++++++- pym/portage/util/_eventloop/GlibEventLoop.py | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'pym/portage/util/_eventloop') diff --git a/pym/portage/util/_eventloop/EventLoop.py b/pym/portage/util/_eventloop/EventLoop.py index 21969e695..02c3cec01 100644 --- a/pym/portage/util/_eventloop/EventLoop.py +++ b/pym/portage/util/_eventloop/EventLoop.py @@ -11,7 +11,7 @@ from _emerge.SlotObject import SlotObject from _emerge.PollConstants import PollConstants from _emerge.PollSelectAdapter import PollSelectAdapter -class EventLoop(PollConstants): +class EventLoop(object): supports_multiprocessing = True @@ -37,6 +37,13 @@ class EventLoop(PollConstants): self._poll_obj = create_poll_instance() self._polling = False + self.IO_ERR = PollConstants.POLLERR + self.IO_HUP = PollConstants.POLLHUP + self.IO_IN = PollConstants.POLLIN + self.IO_NVAL = PollConstants.POLLNVAL + self.IO_OUT = PollConstants.POLLOUT + self.IO_PRI = PollConstants.POLLPRI + def _poll(self, timeout=None): if self._polling: return diff --git a/pym/portage/util/_eventloop/GlibEventLoop.py b/pym/portage/util/_eventloop/GlibEventLoop.py index b35772e7f..1e064eb29 100644 --- a/pym/portage/util/_eventloop/GlibEventLoop.py +++ b/pym/portage/util/_eventloop/GlibEventLoop.py @@ -13,6 +13,12 @@ class GlibEventLoop(object): supports_multiprocessing = False def __init__(self): + self.IO_ERR = glib.IO_ERR + self.IO_HUP = glib.IO_HUP + self.IO_IN = glib.IO_IN + self.IO_NVAL = glib.IO_NVAL + self.IO_OUT = glib.IO_OUT + self.IO_PRI = glib.IO_PRI self.iteration = glib.main_context_default().iteration self.idle_add = glib.idle_add self.io_add_watch = glib.io_add_watch -- cgit v1.2.3-1-g7c22