From 9ed6365f4c6e65f5c38f23505fe704ac5f81feaa Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 17 Feb 2012 20:03:41 -0800 Subject: [PATCH] _eventloop: use explicit relative imports --- pym/portage/util/_eventloop/EventLoop.py | 6 +++--- pym/portage/util/_eventloop/PollSelectAdapter.py | 2 +- pym/portage/util/_eventloop/global_event_loop.py | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pym/portage/util/_eventloop/EventLoop.py b/pym/portage/util/_eventloop/EventLoop.py index 478faab77..a2d4cd40b 100644 --- a/pym/portage/util/_eventloop/EventLoop.py +++ b/pym/portage/util/_eventloop/EventLoop.py @@ -10,9 +10,9 @@ import signal import time from portage.util import writemsg_level -from portage.util.SlotObject import SlotObject -from portage.util._eventloop.PollConstants import PollConstants -from portage.util._eventloop.PollSelectAdapter import PollSelectAdapter +from ..SlotObject import SlotObject +from .PollConstants import PollConstants +from .PollSelectAdapter import PollSelectAdapter class EventLoop(object): diff --git a/pym/portage/util/_eventloop/PollSelectAdapter.py b/pym/portage/util/_eventloop/PollSelectAdapter.py index b91b22aa1..17e63d918 100644 --- a/pym/portage/util/_eventloop/PollSelectAdapter.py +++ b/pym/portage/util/_eventloop/PollSelectAdapter.py @@ -1,7 +1,7 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from portage.util._eventloop.PollConstants import PollConstants +from .PollConstants import PollConstants import select class PollSelectAdapter(object): diff --git a/pym/portage/util/_eventloop/global_event_loop.py b/pym/portage/util/_eventloop/global_event_loop.py index 0f0c53f2b..502dab882 100644 --- a/pym/portage/util/_eventloop/global_event_loop.py +++ b/pym/portage/util/_eventloop/global_event_loop.py @@ -3,11 +3,10 @@ import os -from portage.util._eventloop.EventLoop import EventLoop +from .EventLoop import EventLoop _default_constructor = EventLoop -#from portage.util._eventloop.GlibEventLoop \ -# import GlibEventLoop as _default_constructor +#from .GlibEventLoop import GlibEventLoop as _default_constructor # If _default_constructor doesn't support multiprocessing, # then _multiprocessing_constructor is used in subprocesses. -- 2.26.2