[Zope-Checkins] CVS: Zope3/lib/python/Zope/Exceptions/tests - __init__.py:1.3 testExceptionFormatter.py:1.4

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/Exceptions/tests
In directory cvs.zope.org:/tmp/cvs-serv20468/lib/python/Zope/Exceptions/tests

Modified Files:
	__init__.py testExceptionFormatter.py 
Log Message:
Merged Zope-3x-branch into newly forked Zope3 CVS Tree.

=== Zope3/lib/python/Zope/Exceptions/tests/__init__.py 1.2 => 1.3 ===
+##############################################################################
+#
+# 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.
+# 
+##############################################################################
+"""Package for Zope.Exceptions tests"""


=== Zope3/lib/python/Zope/Exceptions/tests/testExceptionFormatter.py 1.3 => 1.4 ===
 """
 
-from __future__ import nested_scopes
-
 from unittest import TestCase, TestSuite, main, makeSuite
-
-try:
-    from Testing.CleanUp import CleanUp # Base class w registry cleanup
-except ImportError:
-    class CleanUp:
-        pass
+from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
 
 import sys
-from zExceptions.ExceptionFormatter import format_exception
+from Zope.ContextWrapper import wrapper
+from Zope.Exceptions.ExceptionFormatter import format_exception
 
 
 def tb(as_html=0):