From c834ce8a132c0ce5f9e3cb8852f945c9de3918e6 Mon Sep 17 00:00:00 2001 From: Donovan Preston Date: Fri, 12 Mar 2010 14:53:48 -0800 Subject: [PATCH] run on stackless pypy 1.2 http://pypy.org/download.html#stackless-version --- eventlet/__init__.py | 2 +- eventlet/hubs/poll.py | 2 +- eventlet/support/greenlets.py | 4 ++-- examples/producer_consumer.py | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/eventlet/__init__.py b/eventlet/__init__.py index a757d58..9c82d13 100644 --- a/eventlet/__init__.py +++ b/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 diff --git a/eventlet/hubs/poll.py b/eventlet/hubs/poll.py index d6c62ca..ade28d5 100644 --- a/eventlet/hubs/poll.py +++ b/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 diff --git a/eventlet/support/greenlets.py b/eventlet/support/greenlets.py index 1d42858..6111688 100644 --- a/eventlet/support/greenlets.py +++ b/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 diff --git a/examples/producer_consumer.py b/examples/producer_consumer.py index 84e2819..b335f7d 100644 --- a/examples/producer_consumer.py +++ b/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