Merged from trunk -r13663:13666

   | 13664   | Fix imports broken by splitting of _emerge/__init__.py.      |
   | zmedico |                                                              |

   | 13665   | Use lazy imports for submodules where possible.              |
   | zmedico |                                                              |

   | 13666   | Revert lazy imports from r13665 for now, since pyflakes      |
   | zmedico | doesn't understand them, and pyflakes helps check stuff      |
   |         | while we're splitting this file up.                          |

svn path=/main/branches/prefix/; revision=13705

diff --git a/pym/portage/tests/process/test_poll.py b/pym/portage/tests/process/test_poll.py
index e399c479dbe52529b85966287179783e059034a3..f5669780fa745f3349da4c8e30f816ae578026bd 100644 (file)
--- a/pym/portage/tests/process/test_poll.py
+++ b/pym/portage/tests/process/test_poll.py
@@ -8,7 +8,9 @@ import termios
 import portage
 from portage.output import get_term_size, set_term_size
 from portage.tests import TestCase
-from _emerge import PipeReader, SpawnProcess, TaskScheduler
+from _emerge import TaskScheduler
+from _emerge.PipeReader import PipeReader
+from _emerge.SpawnProcess import SpawnProcess
 
 class PipeReaderTestCase(TestCase):