Merge remote-tracking branch 'origin/master'

sdiehl · sdiehl · commit 217112dfeee8 · 2012-06-15T09:42:14.000-04:00
diff --git a/tutorial.md b/tutorial.md
@@ -1090,13 +1090,15 @@ def ajax_endpoint(environ, start_response):
         ('Content-Type', 'application/json')
     ]
 
-    try:
-        datum = data_source.get(timeout=5)
-    except Empty:
-        datum = []
-
     start_response(status, headers)
-    return json.dumps(datum)
+
+    while True:
+        try:
+            datum = data_source.get(timeout=5)
+            yield json.dumps(datum) + '\n'
+        except Empty:
+            pass
+
 
 gevent.spawn(producer)
 
