summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-08-08 20:05:16 +0900
committerkali <kali@leap.se>2012-08-08 20:05:16 +0900
commitc1fa99be4dc4174a34620324ec5056b793196b53 (patch)
tree2ab8a421b7893b03058a5a154a7a880089a45577 /src
parentc217bd1f1456cf10ceabf698ea6f4dd8f636f454 (diff)
parentd17761802e3598bd51887a6c218fa682de22ad49 (diff)
Merge branch 'dict-comprenhension-fix' into develop
fix for 2.6 compatibility, we should try not to use syntax backported from 3.x into 2.7 :|
Diffstat (limited to 'src')
-rw-r--r--src/leap/util/coroutines.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/util/coroutines.py b/src/leap/util/coroutines.py
index 5e25eb63..e7ccfacf 100644
--- a/src/leap/util/coroutines.py
+++ b/src/leap/util/coroutines.py
@@ -74,8 +74,8 @@ def watch_output(out, observers):
for each event
:type ovservers: tuple
"""
- observer_dict = {observer: process_events(observer)
- for observer in observers}
+ observer_dict = dict(((observer, process_events(observer))
+ for observer in observers))
for line in iter(out.readline, b''):
for obs in observer_dict:
observer_dict[obs].send(line)