[CMF-checkins] CVS: CMF/CMFCalendar/tests - test_Calendar.py:1.7 test_Event.py:1.8

[Yvo Schubbe]

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

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


=== CMF/CMFCalendar/tests/test_Calendar.py 1.6 => 1.7 ===
--- CMF/CMFCalendar/tests/test_Calendar.py:1.6	Sun Jan 11 07:47:10 2004
+++ CMF/CMFCalendar/tests/test_Calendar.py	Mon Apr 26 08:14:16 2004
@@ -1,12 +1,24 @@
-import unittest
+##############################################################################
+#
+# Copyright (c) 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.
+#
+##############################################################################
+""" Unit tests for CalendarTool module.
+
+$Id$
+"""
 
+import unittest
 import Testing
 import Zope
-try:
-    Zope.startup()
-except AttributeError:
-    # for Zope versions before 2.6.1
-    pass
+Zope.startup()
 
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.User import UnrestrictedUser
@@ -425,6 +437,7 @@
                                               comment='testing')
 
         assert len(self.Site.portal_calendar.getEventsForThisDay(thisDay=DateTime('1/1/2002'))) == 4
+
 
 def test_suite():
     return unittest.TestSuite((


=== CMF/CMFCalendar/tests/test_Event.py 1.7 => 1.8 ===
--- CMF/CMFCalendar/tests/test_Event.py:1.7	Fri Jan  2 13:15:49 2004
+++ CMF/CMFCalendar/tests/test_Event.py	Mon Apr 26 08:14:16 2004
@@ -1,12 +1,24 @@
-from unittest import TestCase, 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 Event 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
+Zope.startup()
 
 from DateTime import DateTime