Merge pull request sdiehl#6 from traviscline/master

Stephen Diehl · Stephen Diehl · commit eb9f99521b14 · 2012-05-10T03:07:34.000-07:00
gevent-zeromq example fixes
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,5 @@
 Markdown==2.1.1
 cogapp==2.3
 Jinja2==2.6
+gevent
+gevent-zeromq
diff --git a/tutorial.md b/tutorial.md
@@ -730,6 +730,7 @@ gevent-zeromq``
 
 [[[cog
 # Note: Remember to ``pip install pyzmq gevent_zeromq``
+import gevent
 from gevent_zeromq import zmq
 
 # Global Context
@@ -747,7 +748,7 @@ def server():
 
 def client():
     client_socket = context.socket(zmq.REP)
-    client_socket.connect("tcp://*:5000")
+    client_socket.connect("tcp://127.0.0.1:5000")
 
     for request in range(1,10):
 
@@ -756,10 +757,10 @@ def client():
         # Implicit context switch occurs here
         client_socket.send("World")
 
-publisher = gevent.spawn(server),
-client    = gevent.spawn(client),
+publisher = gevent.spawn(server)
+client    = gevent.spawn(client)
 
-gevent.joinall( publisher + client )
+gevent.joinall([publisher, client])
 
 ]]]
 [[[end]]]
