[Zodb-checkins] CVS: Zope3/lib/python/ZEO/zrpc - trigger.py:1.5

Jeremy Hylton jeremy@zope.com
Fri, 20 Dec 2002 17:29:55 -0500


Update of /cvs-repository/Zope3/lib/python/ZEO/zrpc
In directory cvs.zope.org:/tmp/cvs-serv2331

Modified Files:
	trigger.py 
Log Message:
Convert to tracback module from asyncore compact tback.


=== Zope3/lib/python/ZEO/zrpc/trigger.py 1.4 => 1.5 ===
--- Zope3/lib/python/ZEO/zrpc/trigger.py:1.4	Fri Dec 20 15:15:29 2002
+++ Zope3/lib/python/ZEO/zrpc/trigger.py	Fri Dec 20 17:29:54 2002
@@ -16,6 +16,7 @@
 import os
 import socket
 import thread
+import traceback
 
 if os.name == 'posix':
 
@@ -108,9 +109,8 @@
                     try:
                         thunk()
                     except:
-                        nil, t, v, tbinfo = asyncore.compact_traceback()
-                        print ('exception in trigger thunk:'
-                               ' (%s:%s %s)' % (t, v, tbinfo))
+                        L = traceback.format_exception(*sys.exc_info())
+                        print 'exception in trigger thunk:\n%s' % "".join(L)
                 self.thunks = []
             finally:
                 self.lock.release()
@@ -199,9 +199,8 @@
                     try:
                         thunk()
                     except:
-                        nil, t, v, tbinfo = asyncore.compact_traceback()
-                        print ('exception in trigger thunk:'
-                               ' (%s:%s %s)' % (t, v, tbinfo))
+                        L = traceback.format_exception(*sys.exc_info())
+                        print 'exception in trigger thunk:\n%s' % "".join(L)
                 self.thunks = []
             finally:
                 self.lock.release()