svn commit: r807684 - in /qpid/trunk/qpid/python/qpid: compat.py messaging.py

[rh...@apache.org]

Author: rhs
Date: Tue Aug 25 16:04:41 2009
New Revision: 807684

URL: http://svn.apache.org/viewvc?rev=807684&view=rev
Log:
fallback to format_exception for python 2.3

Modified:
    qpid/trunk/qpid/python/qpid/compat.py
    qpid/trunk/qpid/python/qpid/messaging.py

Modified: qpid/trunk/qpid/python/qpid/compat.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/compat.py?rev=807684&r1=807683&r2=807684&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/compat.py (original)
+++ qpid/trunk/qpid/python/qpid/compat.py Tue Aug 25 16:04:41 2009
@@ -26,3 +26,10 @@
   from socket import SHUT_RDWR
 except ImportError:
   SHUT_RDWR = 2
+
+try:
+  from traceback import format_exc
+except ImportError:
+  import sys, traceback
+  def format_exc():
+    return "".join(traceback.format_exception(*sys.exc_info()))

Modified: qpid/trunk/qpid/python/qpid/messaging.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging.py?rev=807684&r1=807683&r2=807684&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/messaging.py (original)
+++ qpid/trunk/qpid/python/qpid/messaging.py Tue Aug 25 16:04:41 2009
@@ -30,7 +30,7 @@
   - protocol negotiation/multiprotocol impl
 """
 
-import connection, time, socket, sys, traceback
+import connection, time, socket, sys, compat
 from codec010 import StringCodec
 from datatypes import timestamp, uuid4, RangedSet, Message as Message010, Serial
 from exceptions import Timeout
@@ -907,7 +907,7 @@
       exi = sys.exc_info()
 
     if exi:
-      msg = traceback.format_exc()
+      msg = compat.format_exc()
       recoverable = ["aborted", "Connection refused", "SessionDetached", "Connection reset by peer",
                      "Bad file descriptor", "start timed out", "Broken pipe"]
       for r in recoverable:



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org