Merge

eventlet/__init__.py

@@ -32,7 +32,7 @@ try:
     serve = convenience.serve
     StopServe = convenience.StopServe
 
-    getcurrent = greenlet.getcurrent
+    getcurrent = greenlet.greenlet.getcurrent
     
     # deprecated    
     TimeoutError = timeout.Timeout

eventlet/hubs/poll.py

@@ -77,7 +77,7 @@ class Hub(BaseHub):
                 sleep(seconds)
             return
         try:
-            presult = self.poll.poll(seconds * self.WAIT_MULTIPLIER)
+            presult = self.poll.poll(int(seconds * self.WAIT_MULTIPLIER))
         except select.error, e:
             if get_errno(e) == errno.EINTR:
                 return

eventlet/support/greenlets.py

@@ -1,7 +1,7 @@
 try:
     import greenlet
-    getcurrent = greenlet.getcurrent
-    GreenletExit = greenlet.GreenletExit
+    getcurrent = greenlet.greenlet.getcurrent
+    GreenletExit = greenlet.greenlet.GreenletExit
     greenlet = greenlet.greenlet
 except ImportError, e:
     raise

examples/producer_consumer.py

@@ -9,6 +9,7 @@ GreenPool handles any exceptions raised and arranges so that there's a set
 number of "workers", so you don't have to write that tedious management code 
 yourself.
 """
+from __future__ import with_statement
 
 from eventlet.green import urllib2
 import eventlet