[CMF-checkins] CVS: CMF/CMFTopic/tests - test_DateC.py:1.12 test_ListC.py:1.10 test_SIC.py:1.10 test_SSC.py:1.9 test_SortC.py:1.5 test_Topic.py:1.13

[Yvo Schubbe]

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

Modified Files:
	test_DateC.py test_ListC.py test_SIC.py test_SSC.py 
	test_SortC.py test_Topic.py 
Log Message:
- removed pre Zope 2.6.4 compatibility code
- some whitespace, import and header cleanup


=== CMF/CMFTopic/tests/test_DateC.py 1.11 => 1.12 ===
--- CMF/CMFTopic/tests/test_DateC.py:1.11	Thu Feb 19 10:59:05 2004
+++ CMF/CMFTopic/tests/test_DateC.py	Mon Apr 26 08:14:19 2004
@@ -16,14 +16,9 @@
 """
 
 from unittest import TestCase, TestSuite, makeSuite, main
-
 import Testing
 import Zope
-try:
-    Zope.startup()
-except AttributeError:
-    # for Zope versions before 2.6.1
-    pass
+Zope.startup()
 
 from DateTime.DateTime import DateTime
 


=== CMF/CMFTopic/tests/test_ListC.py 1.9 => 1.10 ===
--- CMF/CMFTopic/tests/test_ListC.py:1.9	Fri Jan  2 13:15:50 2004
+++ CMF/CMFTopic/tests/test_ListC.py	Mon Apr 26 08:14:19 2004
@@ -16,14 +16,9 @@
 """
 
 from unittest import TestCase, TestSuite, makeSuite, main
-
 import Testing
 import Zope
-try:
-    Zope.startup()
-except AttributeError:
-    # for Zope versions before 2.6.1
-    pass
+Zope.startup()
 
 
 class ListCriterionTests(TestCase):


=== CMF/CMFTopic/tests/test_SIC.py 1.9 => 1.10 ===
--- CMF/CMFTopic/tests/test_SIC.py:1.9	Thu Feb 19 10:59:05 2004
+++ CMF/CMFTopic/tests/test_SIC.py	Mon Apr 26 08:14:19 2004
@@ -16,14 +16,9 @@
 """
 
 from unittest import TestCase, TestSuite, makeSuite, main
-
 import Testing
 import Zope
-try:
-    Zope.startup()
-except AttributeError:
-    # for Zope versions before 2.6.1
-    pass
+Zope.startup()
 
 from Products.CMFTopic.SimpleIntCriterion import SimpleIntCriterion
 


=== CMF/CMFTopic/tests/test_SSC.py 1.8 => 1.9 ===
--- CMF/CMFTopic/tests/test_SSC.py:1.8	Fri Jan  2 13:15:50 2004
+++ CMF/CMFTopic/tests/test_SSC.py	Mon Apr 26 08:14:19 2004
@@ -16,14 +16,9 @@
 """
 
 from unittest import TestCase, TestSuite, makeSuite, main
-
 import Testing
 import Zope
-try:
-    Zope.startup()
-except AttributeError:
-    # for Zope versions before 2.6.1
-    pass
+Zope.startup()
 
 
 class SimpleStringCriterionTests(TestCase):


=== CMF/CMFTopic/tests/test_SortC.py 1.4 => 1.5 ===
--- CMF/CMFTopic/tests/test_SortC.py:1.4	Fri Jan  2 13:15:50 2004
+++ CMF/CMFTopic/tests/test_SortC.py	Mon Apr 26 08:14:19 2004
@@ -16,14 +16,9 @@
 """
 
 from unittest import TestCase, TestSuite, makeSuite, main
-
 import Testing
 import Zope
-try:
-    Zope.startup()
-except AttributeError:
-    # for Zope versions before 2.6.1
-    pass
+Zope.startup()
 
 
 class SortCriterionTests(TestCase):


=== CMF/CMFTopic/tests/test_Topic.py 1.12 => 1.13 ===
--- CMF/CMFTopic/tests/test_Topic.py:1.12	Mon Jan 12 05:53:09 2004
+++ CMF/CMFTopic/tests/test_Topic.py	Mon Apr 26 08:14:19 2004
@@ -1,18 +1,29 @@
-from unittest import TestSuite, makeSuite, main
+##############################################################################
+#
+# Copyright (c) 2001 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
+#
+##############################################################################
+""" Unit tests for Topic module.
+
+$Id$
+"""
 
+from unittest import TestSuite, makeSuite, main
 import Testing
 import Zope
-try:
-    Zope.startup()
-except AttributeError:
-    # for Zope versions before 2.6.1
-    pass
+Zope.startup()
 
 from Products.CMFCore.tests.base.dummy import DummySite
 from Products.CMFCore.tests.base.testcase import SecurityTest
 from Products.CMFCore.TypesTool import FactoryTypeInformation as FTI
 from Products.CMFCore.TypesTool import TypesTool
-
 from Products.CMFTopic.Topic import factory_type_information as FTIDATA_TOPIC
 from Products.CMFTopic.Topic import Topic