Merge

2 files changed, 4 insertions, 2 deletions

diff --git a/NOTES b/NOTES
index c8f274d..3b94ba9 100644
--- a/NOTES
+++ b/NOTES
@@ -8,7 +8,9 @@ Notes from PyCon 2013 sprints
 - Adam Sah suggests that there might be a need for scheduling
   (especially when multiple frameworks share an event loop).  He
   points to lottery scheduling but also mentions that's just one of
-  the options.
+  the options.  However, after posting on python-tulip, it appears
+  none of the other frameworks have scheduling, and nobody seems to
+  miss it.
 
 - Feedback from Bram Cohen (Bittorrent creator) about UDP.  He doesn't
   think connected UDP is worth supporting, it doesn't do anything
diff --git a/curl.py b/curl.py
index 0624df8..6986fc2 100755
--- a/curl.py
+++ b/curl.py
@@ -22,7 +22,7 @@ def main():
     for k, v in headers.items():
         print('{}: {}'.format(k, v))
     print()
-    data = p.event_loop.run_until_complete(tulip.Task(stream))
+    data = p.event_loop.run_until_complete(tulip.Task(stream.read()))
     print(data.decode('utf-8', 'replace'))