diff options
-rw-r--r-- | cherrypy/wsgiserver/wsgiserver2.py | 13 | ||||
-rw-r--r-- | cherrypy/wsgiserver/wsgiserver3.py | 4 |
2 files changed, 4 insertions, 13 deletions
diff --git a/cherrypy/wsgiserver/wsgiserver2.py b/cherrypy/wsgiserver/wsgiserver2.py index 7afdab75..a99a2e5e 100644 --- a/cherrypy/wsgiserver/wsgiserver2.py +++ b/cherrypy/wsgiserver/wsgiserver2.py @@ -112,16 +112,7 @@ del FauxSocket # this class is not longer required for anything. import threading import time -import traceback - - -def format_exc(limit=None): - """Like print_exc() but return a string. Backport for Python 2.3.""" - try: - etype, value, tb = sys.exc_info() - return ''.join(traceback.format_exception(etype, value, tb, limit)) - finally: - etype = value = tb = None +import traceback as traceback_ import operator @@ -1989,7 +1980,7 @@ class HTTPServer(object): sys.stderr.write(msg + '\n') sys.stderr.flush() if traceback: - tblines = format_exc() + tblines = traceback_.format_exc() sys.stderr.write(tblines) sys.stderr.flush() diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/cherrypy/wsgiserver/wsgiserver3.py index 90762b14..8341729e 100644 --- a/cherrypy/wsgiserver/wsgiserver3.py +++ b/cherrypy/wsgiserver/wsgiserver3.py @@ -100,7 +100,7 @@ DEFAULT_BUFFER_SIZE = io.DEFAULT_BUFFER_SIZE import threading import time -from traceback import format_exc +import traceback as traceback_ if sys.version_info >= (3, 0): bytestr = bytes @@ -1681,7 +1681,7 @@ class HTTPServer(object): sys.stderr.write(msg + '\n') sys.stderr.flush() if traceback: - tblines = format_exc() + tblines = traceback_.format_exc() sys.stderr.write(tblines) sys.stderr.flush() |