From bb598239af1cd572c2398959f43b14e1d99801e4 Mon Sep 17 00:00:00 2001
From: donovan <donovan@ell-ee-dee.local>
Date: Tue, 30 Dec 2008 16:04:49 -0800
Subject: [PATCH] remove greenlib depenencies, and squelch exceptions in
 switch_out

---
 eventlet/backdoor.py      | 1 -
 eventlet/hubs/hub.py      | 5 ++++-
 eventlet/hubs/libevent.py | 1 -
 eventlet/util.py          | 3 +--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eventlet/backdoor.py b/eventlet/backdoor.py
index 38833e8..f6b790b 100644
--- a/eventlet/backdoor.py
+++ b/eventlet/backdoor.py
@@ -28,7 +28,6 @@ THE SOFTWARE.
 import socket
 import sys
 from code import InteractiveConsole
-from eventlet import greenlib
 
 from eventlet import api
 from eventlet.support import greenlets
diff --git a/eventlet/hubs/hub.py b/eventlet/hubs/hub.py
index b9e195b..41c3af0 100644
--- a/eventlet/hubs/hub.py
+++ b/eventlet/hubs/hub.py
@@ -123,7 +123,10 @@ class BaseHub(object):
         cur = greenlet.getcurrent()
         switch_out = getattr(cur, 'switch_out', None)
         if switch_out is not None:
-            switch_out()
+            try:
+                switch_out()
+            except:
+                traceback.print_exception(*sys.exc_info())
         if self.greenlet.dead:
             self.greenlet = greenlet.greenlet(self.run)
         try:
diff --git a/eventlet/hubs/libevent.py b/eventlet/hubs/libevent.py
index fab7d03..8a2f43b 100644
--- a/eventlet/hubs/libevent.py
+++ b/eventlet/hubs/libevent.py
@@ -29,7 +29,6 @@ import errno
 import traceback
 import time
 
-from eventlet import greenlib
 from eventlet.timer import Timer
 from eventlet.hubs import hub
 
diff --git a/eventlet/util.py b/eventlet/util.py
index ed5be69..f83c286 100644
--- a/eventlet/util.py
+++ b/eventlet/util.py
@@ -49,8 +49,7 @@ except ImportError:
 def g_log(*args):
     import sys
     from eventlet.support import greenlets as greenlet
-    from eventlet.greenlib import greenlet_id
-    g_id = greenlet_id()
+    g_id = id(greenlet.getcurrent())
     if g_id is None:
         if greenlet.getcurrent().parent is None:
             ident = 'greenlet-main'