Merge
This commit is contained in:
@@ -32,7 +32,7 @@ try:
|
|||||||
serve = convenience.serve
|
serve = convenience.serve
|
||||||
StopServe = convenience.StopServe
|
StopServe = convenience.StopServe
|
||||||
|
|
||||||
getcurrent = greenlet.getcurrent
|
getcurrent = greenlet.greenlet.getcurrent
|
||||||
|
|
||||||
# deprecated
|
# deprecated
|
||||||
TimeoutError = timeout.Timeout
|
TimeoutError = timeout.Timeout
|
||||||
|
@@ -77,7 +77,7 @@ class Hub(BaseHub):
|
|||||||
sleep(seconds)
|
sleep(seconds)
|
||||||
return
|
return
|
||||||
try:
|
try:
|
||||||
presult = self.poll.poll(seconds * self.WAIT_MULTIPLIER)
|
presult = self.poll.poll(int(seconds * self.WAIT_MULTIPLIER))
|
||||||
except select.error, e:
|
except select.error, e:
|
||||||
if get_errno(e) == errno.EINTR:
|
if get_errno(e) == errno.EINTR:
|
||||||
return
|
return
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
try:
|
try:
|
||||||
import greenlet
|
import greenlet
|
||||||
getcurrent = greenlet.getcurrent
|
getcurrent = greenlet.greenlet.getcurrent
|
||||||
GreenletExit = greenlet.GreenletExit
|
GreenletExit = greenlet.greenlet.GreenletExit
|
||||||
greenlet = greenlet.greenlet
|
greenlet = greenlet.greenlet
|
||||||
except ImportError, e:
|
except ImportError, e:
|
||||||
raise
|
raise
|
||||||
|
@@ -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
|
number of "workers", so you don't have to write that tedious management code
|
||||||
yourself.
|
yourself.
|
||||||
"""
|
"""
|
||||||
|
from __future__ import with_statement
|
||||||
|
|
||||||
from eventlet.green import urllib2
|
from eventlet.green import urllib2
|
||||||
import eventlet
|
import eventlet
|
||||||
|
Reference in New Issue
Block a user