[Zodb-checkins] CVS: Zope/lib/python/zLOG - MinimalLogger.py:1.17.12.1 __init__.py:1.8.26.1 FormatException.py:NONE

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/zLOG
In directory cvs.zope.org:/tmp/cvs-serv26094/lib/python/zLOG

Modified Files:
      Tag: ajung-restructuredtext-integration-branch
	MinimalLogger.py __init__.py 
Removed Files:
      Tag: ajung-restructuredtext-integration-branch
	FormatException.py 
Log Message:
merge from trunk


=== Zope/lib/python/zLOG/MinimalLogger.py 1.17 => 1.17.12.1 ===
--- Zope/lib/python/zLOG/MinimalLogger.py:1.17	Fri Sep 27 12:14:40 2002
+++ Zope/lib/python/zLOG/MinimalLogger.py	Sat Nov  9 03:43:01 2002
@@ -20,7 +20,7 @@
 except ImportError:
     textwrap = None
 
-from FormatException import format_exception
+from traceback import format_exception
 
 def severity_string(severity, mapping={
     -300: 'TRACE',
@@ -99,7 +99,7 @@
                 lines = format_exception(error[0], error[1], error[2],
                                          limit=100)
                 buf.append(''.join(lines))
-            except '':
+            except:
                 buf.append("%s: %s" % error[:2])
 
         if buf[-1] and buf[-1][-1] != "\n":


=== Zope/lib/python/zLOG/__init__.py 1.8 => 1.8.26.1 ===
--- Zope/lib/python/zLOG/__init__.py:1.8	Wed Aug 14 18:12:33 2002
+++ Zope/lib/python/zLOG/__init__.py	Sat Nov  9 03:43:01 2002
@@ -90,7 +90,7 @@
 
 from MinimalLogger import log_write, log_time, severity_string, \
      _set_log_dest, initialize
-from FormatException import format_exception
+from traceback import format_exception
 
 # Standard severities
 TRACE   = -300

=== Removed File Zope/lib/python/zLOG/FormatException.py ===