remove greenlib depenencies, and squelch exceptions in switch_out

This commit is contained in:
donovan
2008-12-30 16:04:49 -08:00
parent c4923f1124
commit bb598239af
4 changed files with 5 additions and 5 deletions

View File

@@ -28,7 +28,6 @@ THE SOFTWARE.
import socket import socket
import sys import sys
from code import InteractiveConsole from code import InteractiveConsole
from eventlet import greenlib
from eventlet import api from eventlet import api
from eventlet.support import greenlets from eventlet.support import greenlets

View File

@@ -123,7 +123,10 @@ class BaseHub(object):
cur = greenlet.getcurrent() cur = greenlet.getcurrent()
switch_out = getattr(cur, 'switch_out', None) switch_out = getattr(cur, 'switch_out', None)
if switch_out is not None: if switch_out is not None:
try:
switch_out() switch_out()
except:
traceback.print_exception(*sys.exc_info())
if self.greenlet.dead: if self.greenlet.dead:
self.greenlet = greenlet.greenlet(self.run) self.greenlet = greenlet.greenlet(self.run)
try: try:

View File

@@ -29,7 +29,6 @@ import errno
import traceback import traceback
import time import time
from eventlet import greenlib
from eventlet.timer import Timer from eventlet.timer import Timer
from eventlet.hubs import hub from eventlet.hubs import hub

View File

@@ -49,8 +49,7 @@ except ImportError:
def g_log(*args): def g_log(*args):
import sys import sys
from eventlet.support import greenlets as greenlet from eventlet.support import greenlets as greenlet
from eventlet.greenlib import greenlet_id g_id = id(greenlet.getcurrent())
g_id = greenlet_id()
if g_id is None: if g_id is None:
if greenlet.getcurrent().parent is None: if greenlet.getcurrent().parent is None:
ident = 'greenlet-main' ident = 'greenlet-main'