Merge remote-tracking branch 'origin/subprocessexample'

sdiehl · sdiehl · commit 9bf0fbba4385 · 2013-01-25T11:06:05.000-06:00
Conflicts:
	tutorial.md
diff --git a/tutorial.md b/tutorial.md
@@ -973,21 +973,31 @@ As of gevent 1.0, ``gevent.subprocess`` -- a patched version of Python's
 subprocesses.
 
 <pre>
-<code class="python">import gevent
+<code class="python">
+import gevent
 from gevent.subprocess import Popen, PIPE
 
-# Uses a green pipe which is cooperative
-sub = Popen(['uname'], stdout=PIPE)
-read_output = gevent.spawn(sub.stdout.read)
-
-output = read_output.join()
-print(output.value)
-</code>
+def cron():
+    while True:
+        print "cron"
+        gevent.sleep(0.2)
+
+g = gevent.spawn(cron)
+sub = Popen(['sleep 1; uname'], stdout=PIPE, shell=True)
+out, err = sub.communicate()
+g.kill()
+print out.rstrip()
 </pre>
 
 <pre>
-<code class="python">Linux
-</code>
+<code class="python">
+cron
+cron
+cron
+cron
+cron
+Linux
+<code>
 </pre>
 
 Many people also want to use ``gevent`` and ``multiprocessing`` together. One of
