Commit 3610af47 authored by Guido van Rossum's avatar Guido van Rossum

Remove FormatException. Always use traceback.format_exception.

(__init__.py still makes format_exception available; is this needed?)
parent 19f15f09
##############################################################################
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
#
##############################################################################
__version__='$Revision: 1.7 $'[11:-2]
try:
# Use the exception formatter in zExceptions
from zExceptions.ExceptionFormatter import format_exception
except ImportError:
# Not available. Use the basic formatter.
from traceback import format_exception
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE # FOR A PARTICULAR PURPOSE
# #
############################################################################## ##############################################################################
__version__='$Revision: 1.18 $'[11:-2] __version__='$Revision: 1.19 $'[11:-2]
import os, sys, time import os, sys, time
...@@ -20,7 +20,7 @@ try: ...@@ -20,7 +20,7 @@ try:
except ImportError: except ImportError:
textwrap = None textwrap = None
from FormatException import format_exception from traceback import format_exception
def severity_string(severity, mapping={ def severity_string(severity, mapping={
-300: 'TRACE', -300: 'TRACE',
......
...@@ -86,11 +86,11 @@ There is a default event logging facility that: ...@@ -86,11 +86,11 @@ There is a default event logging facility that:
can be overridden with the environment variable EVENT_LOG_SEVERITY can be overridden with the environment variable EVENT_LOG_SEVERITY
""" """
__version__='$Revision: 1.8 $'[11:-2] __version__='$Revision: 1.9 $'[11:-2]
from MinimalLogger import log_write, log_time, severity_string, \ from MinimalLogger import log_write, log_time, severity_string, \
_set_log_dest, initialize _set_log_dest, initialize
from FormatException import format_exception from traceback import format_exception
# Standard severities # Standard severities
TRACE = -300 TRACE = -300
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment