SESPRINGPYTHONPY-137: No need to duplicate stdlib's functionality (patch by Alan Franzoni).

Dariusz Suchojad · Dariusz Suchojad · commit 97a3f538082b · 2010-02-25T09:52:26.000Z
git-svn-id: https://src.springframework.org/svn/se-springpython-py/trunk/springpython@741 ce8fead1-4192-4296-8608-a705134b927f
diff --git a/src/springpython/context/__init__.py b/src/springpython/context/__init__.py
@@ -16,8 +16,8 @@
 
 import atexit
 import logging
+from traceback import format_exc
 
-from springpython.util import get_last_traceback
 from springpython.container import ObjectContainer
 
 class ApplicationContext(ObjectContainer):
@@ -97,7 +97,7 @@ def shutdown_hook(self):
                     destroy_method = getattr(obj, destroy_method_name)
                     
                 except Exception, e:
-                    self.logger.error("Could not destroy object '%s', exception '%s'" % (obj_name, get_last_traceback(e)))
+                    self.logger.error("Could not destroy object '%s', exception '%s'" % (obj_name, format_exc()))
                     
                 else:
                     if callable(destroy_method):
@@ -106,7 +106,7 @@ def shutdown_hook(self):
                             destroy_method()
                             self.logger.debug("Successfully destroyed object '%s'" % obj_name)
                         except Exception, e:
-                            self.logger.error("Could not destroy object '%s', exception '%s'" % (obj_name, get_last_traceback(e)))
+                            self.logger.error("Could not destroy object '%s', exception '%s'" % (obj_name, format_exc()))
                     else:
                         self.logger.error("Could not destroy object '%s', " \
                             "the 'destroy_method' attribute it defines is not callable, " \
diff --git a/src/springpython/jms/factory.py b/src/springpython/jms/factory.py
@@ -23,6 +23,7 @@
 from xml.sax.saxutils import escape
 from binascii import hexlify, unhexlify
 from time import time, mktime, strptime, altzone
+from traceback import format_exc
 
 try:
     import cElementTree as etree
@@ -35,7 +36,7 @@
 # Spring Python
 from springpython.context import DisposableObject
 from springpython.jms.core import reserved_attributes, TextMessage
-from springpython.util import TRACE1, get_last_traceback, synchronized
+from springpython.util import TRACE1, synchronized
 from springpython.jms import JMSException, WebSphereMQJMSException, \
     NoMessageAvailableException, DELIVERY_MODE_NON_PERSISTENT, \
     DELIVERY_MODE_PERSISTENT
@@ -138,7 +139,7 @@ def destroy(self):
                 self.logger.info("Caches cleared")
             except Exception, e:
                 try:
-                    self.logger.error("Could not clear the caches. Exception [%s]" % get_last_traceback(e))
+                    self.logger.error("Could not clear the caches. Exception [%s]" % format_exc())
                 except:
                     pass
             try:
@@ -148,7 +149,7 @@ def destroy(self):
             except Exception, e:
                 try:
                     self.logger.error("Could not disconnect from queue manager [%s], exception [%s] " % (self.queue_manager, 
-                        get_last_traceback(e)))
+                        format_exc()))
                 except Exception:
                     pass
                 
diff --git a/src/springpython/util.py b/src/springpython/util.py
@@ -11,41 +11,31 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.       
+   limitations under the License.
 """
 import logging
 import traceback
-
 from threading import RLock, currentThread
 
 try:
     from cStringIO import StringIO
 except ImportError, e:
     from StringIO import StringIO
-    
-    
+
+
 TRACE1 = 6
 logging.addLevelName(TRACE1, "TRACE1")
 
-
-def get_last_traceback(exception):
-    """ A utility function for better displaying exceptions.
-    """
-    buff = StringIO()
-    traceback.print_exc(file=buff)
-    
-    return buff.getvalue()
-    
 # Original code by Anand Balachandran Pillai (abpillai at gmail.com)
 # http://code.activestate.com/recipes/533135/
 class synchronized(object):
     """ Class enapsulating a lock and a function allowing it to be used as
     a synchronizing decorator making the wrapped function thread-safe """
-    
+
     def __init__(self, *args):
         self.lock = RLock()
         self.logger = logging.getLogger("springpython.util.synchronized")
-        
+
     def __call__(self, f):
         def lockedfunc(*args, **kwargs):
             try:
