1 |
commit: cb941c1a7567d42441340b57cbc4ed8c5ae38f71 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 12 06:16:57 2012 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 12 06:16:57 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cb941c1a |
7 |
|
8 |
Scheduler: simplify _sched_iface construction |
9 |
|
10 |
--- |
11 |
pym/_emerge/Scheduler.py | 17 +++-------------- |
12 |
1 files changed, 3 insertions(+), 14 deletions(-) |
13 |
|
14 |
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py |
15 |
index 5bb4fe8..b84f7bb 100644 |
16 |
--- a/pym/_emerge/Scheduler.py |
17 |
+++ b/pym/_emerge/Scheduler.py |
18 |
@@ -215,22 +215,11 @@ class Scheduler(PollScheduler): |
19 |
fetch_iface = self._fetch_iface_class(log_file=self._fetch_log, |
20 |
schedule=self._schedule_fetch) |
21 |
self._sched_iface = self._iface_class( |
22 |
- IO_ERR=self._event_loop.IO_ERR, |
23 |
- IO_HUP=self._event_loop.IO_HUP, |
24 |
- IO_IN=self._event_loop.IO_IN, |
25 |
- IO_NVAL=self._event_loop.IO_NVAL, |
26 |
- IO_OUT=self._event_loop.IO_OUT, |
27 |
- IO_PRI=self._event_loop.IO_PRI, |
28 |
- fetch=fetch_iface, output=self._task_output, |
29 |
- idle_add=self._event_loop.idle_add, |
30 |
- io_add_watch=self._event_loop.io_add_watch, |
31 |
- iteration=self._event_loop.iteration, |
32 |
- register=self._event_loop.io_add_watch, |
33 |
+ fetch=fetch_iface, |
34 |
scheduleSetup=self._schedule_setup, |
35 |
scheduleUnpack=self._schedule_unpack, |
36 |
- source_remove=self._event_loop.source_remove, |
37 |
- timeout_add=self._event_loop.timeout_add, |
38 |
- unregister=self._event_loop.source_remove) |
39 |
+ **dict((k, getattr(self.sched_iface, k)) |
40 |
+ for k in self.sched_iface.__slots__)) |
41 |
|
42 |
self._prefetchers = weakref.WeakValueDictionary() |
43 |
self._pkg_queue = [] |