Forgot to add these changes which are needed by the addressbook

diff --git a/src/util/coroutines.py b/src/util/coroutines.py
index 6d802e8..b1e539e 100755 (executable)
--- a/src/util/coroutines.py
+++ b/src/util/coroutines.py
@@ -156,6 +156,19 @@ def comap(function, target):
                        target.throw(e.__class__, e.message)\r
 \r
 \r
                        target.throw(e.__class__, e.message)\r
 \r
 \r

+def func_sink(function):\r
+       return comap(function, null_sink())\r
+\r
+\r
+def expand_positional(function):\r
+\r
+       @functools.wraps(function)\r
+       def expander(item):\r
+               return function(*item)\r
+\r
+       return expander\r
+\r
+\r

 @autostart\r
 def append_sink(l):\r
        """\r
 @autostart\r
 def append_sink(l):\r
        """\r

diff --git a/src/util/misc.py b/src/util/misc.py
index 7abecf3..85c6ca0 100644 (file)
--- a/src/util/misc.py
+++ b/src/util/misc.py
@@ -6,7 +6,6 @@ import sys
 import cPickle
 
 import functools
 import cPickle
 
 import functools

-import itertools

 import contextlib
 import inspect
 
 import contextlib
 import inspect