From d33bb039e22f13e009eecc0557be7d1c4789c951 Mon Sep 17 00:00:00 2001
From: Ryan Williams <rdw@lindenlab.com>
Date: Fri, 8 Jan 2010 12:39:10 -0800
Subject: [PATCH] Added silent timer support to pyevent hub, upgraded api_test
 to use actual unit test primitives rather than inventing its own.

---
 eventlet/hubs/pyevent.py | 3 ++-
 tests/api_test.py        | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/eventlet/hubs/pyevent.py b/eventlet/hubs/pyevent.py
index 6b8fbd2..3dab7d1 100644
--- a/eventlet/hubs/pyevent.py
+++ b/eventlet/hubs/pyevent.py
@@ -96,7 +96,8 @@ class Hub(BaseHub):
                     self.schedule_call_global(0, api.getcurrent().parent.throw, *self.signal_exc_info)
                     self.signal_exc_info = None
                 else:
-                    traceback.print_exc()
+                    if not self.silent_timer_exceptions:
+                        traceback.print_exc()
 
     def abort(self):
         self.schedule_call_global(0, self.greenlet.throw, api.GreenletExit)
diff --git a/tests/api_test.py b/tests/api_test.py
index 3e29cfe..343293d 100644
--- a/tests/api_test.py
+++ b/tests/api_test.py
@@ -210,12 +210,12 @@ class TestApi(TestCase):
             state.append('finished')
         g = api.spawn(test)
         api.sleep(DELAY/2)
-        assert state == ['start'], state
+        self.assertEquals(state, ['start'])
         api.kill(g)
         # will not get there, unless switching is explicitly scheduled by kill
-        assert state == ['start', 'except'], state
+        self.assertEquals(state,['start', 'except'])
         api.sleep(DELAY)
-        assert state == ['start', 'except', 'finished'], state
+        self.assertEquals(state, ['start', 'except', 'finished'])
 
     def test_nested_with_timeout(self):
         def func():