| 1 |
commit: cda8009b77feda580ee57f576d6fcaadc9ca65fc |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 9 02:10:38 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 9 02:10:38 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cda8009b |
| 7 |
|
| 8 |
PollScheduler: remove EventLoop._schedule hook |
| 9 |
|
| 10 |
PollScheduler and subclasses be should already be calling |
| 11 |
self._schedule() when necessary. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/_emerge/PollScheduler.py | 17 +++++------------ |
| 15 |
1 files changed, 5 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py |
| 18 |
index ee00f10..ab65054 100644 |
| 19 |
--- a/pym/_emerge/PollScheduler.py |
| 20 |
+++ b/pym/_emerge/PollScheduler.py |
| 21 |
@@ -46,10 +46,6 @@ class EventLoop(object): |
| 22 |
self._poll_obj = create_poll_instance() |
| 23 |
self._polling = False |
| 24 |
|
| 25 |
- def _schedule(self): |
| 26 |
- pass |
| 27 |
- |
| 28 |
- |
| 29 |
def _poll(self, timeout=None): |
| 30 |
if self._polling: |
| 31 |
return |
| 32 |
@@ -107,12 +103,11 @@ class EventLoop(object): |
| 33 |
StopIteration if timeout is None and there are |
| 34 |
no file descriptors to poll. |
| 35 |
""" |
| 36 |
- if not self._poll_event_handlers: |
| 37 |
- self._schedule() |
| 38 |
- if timeout is None and \ |
| 39 |
- not self._poll_event_handlers: |
| 40 |
- raise StopIteration( |
| 41 |
- "timeout is None and there are no poll() event handlers") |
| 42 |
+ |
| 43 |
+ if timeout is None and \ |
| 44 |
+ not self._poll_event_handlers: |
| 45 |
+ raise StopIteration( |
| 46 |
+ "timeout is None and there are no poll() event handlers") |
| 47 |
|
| 48 |
# The following error is known to occur with Linux kernel versions |
| 49 |
# less than 2.6.24: |
| 50 |
@@ -367,7 +362,6 @@ class PollScheduler(object): |
| 51 |
"source_remove", "timeout_add", "unregister") |
| 52 |
|
| 53 |
def __init__(self): |
| 54 |
- super(PollScheduler, self).__init__() |
| 55 |
self._terminated = threading.Event() |
| 56 |
self._terminated_tasks = False |
| 57 |
self._max_jobs = 1 |
| 58 |
@@ -376,7 +370,6 @@ class PollScheduler(object): |
| 59 |
self._scheduling = False |
| 60 |
self._background = False |
| 61 |
self._event_loop = EventLoop() |
| 62 |
- self._event_loop._schedule = self._schedule |
| 63 |
self.sched_iface = self._sched_iface_class( |
| 64 |
idle_add=self._event_loop.idle_add, |
| 65 |
io_add_watch=self._event_loop.io_add_watch, |
Archives