[CMF-checkins] CVS: CMF/DCWorkflow/tests - test_DCWorkflow.py:1.3 test_roles.py:1.4

[Yvo Schubbe]

Update of /cvs-repository/CMF/DCWorkflow/tests
In directory cvs.zope.org:/tmp/cvs-serv5625/DCWorkflow/tests

Modified Files:
	test_DCWorkflow.py test_roles.py 
Log Message:
- removed pre Zope 2.6.4 compatibility code
- some whitespace, import and header cleanup


=== CMF/DCWorkflow/tests/test_DCWorkflow.py 1.2 => 1.3 ===
--- CMF/DCWorkflow/tests/test_DCWorkflow.py:1.2	Thu Jan 15 12:14:44 2004
+++ CMF/DCWorkflow/tests/test_DCWorkflow.py	Mon Apr 26 08:14:20 2004
@@ -1,34 +1,25 @@
 ##############################################################################
 #
 # Copyright (c) 2003 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
-# 
+#
 ##############################################################################
-"""DCWorkflow tests.
+""" Unit tests for DCWorkflow module.
 
 $Id$
 """
 
 from unittest import TestCase, TestSuite, makeSuite, main
-
 import Testing
 import Zope
-try:
-    Zope.startup()
-except AttributeError:
-    # for Zope versions before 2.6.1
-    pass
-try:
-    from Interface.Verify import verifyClass
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import verify_class_implementation as verifyClass
+Zope.startup()
+from Interface.Verify import verifyClass
 
 from Products.CMFCore.tests.base.dummy import DummyContent
 from Products.CMFCore.tests.base.dummy import DummySite


=== CMF/DCWorkflow/tests/test_roles.py 1.3 => 1.4 ===
--- CMF/DCWorkflow/tests/test_roles.py:1.3	Wed Mar 31 18:19:53 2004
+++ CMF/DCWorkflow/tests/test_roles.py	Mon Apr 26 08:14:20 2004
@@ -1,21 +1,24 @@
 ##############################################################################
 #
 # Copyright (c) 2004 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.
-# 
+#
 ##############################################################################
-"""Tests of role-mapping machinery.
+""" Unit tests of role-mapping machinery.
 
 $Id$
 """
 
 import unittest
+import Testing
+import Zope
+Zope.startup()
 
 from OFS.Folder import Folder
 from OFS.Application import Application