[CMF-checkins] CVS: CMF/CMFCalendar/tests - test_Event.py:1.4.8.1 test_all.py:1.5.6.1

[Tres Seaver]

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

Modified Files:
      Tag: CMF-1_3-branch
	test_Event.py test_all.py 
Log Message:
 - Import cleanup.

=== CMF/CMFCalendar/tests/test_Event.py 1.4 => 1.4.8.1 ===
 import Zope
-from unittest import TestCase, TestSuite, main, makeSuite
 from Products.CMFCalendar.Event import Event
 from DateTime import DateTime
 
-class TestEvent(TestCase):
+class TestEvent(unittest.TestCase):
 
     def test_new(self):
         event = Event('test')
@@ -47,9 +47,9 @@
                          )
 
 def test_suite():
-    return TestSuite((
-        makeSuite( TestEvent ),
+    return unittest.TestSuite((
+        unittest.makeSuite( TestEvent ),
         ))
 
 if __name__ == '__main__':
-    main(defaultTest='test_suite')
+    unittest.main(defaultTest='test_suite')


=== CMF/CMFCalendar/tests/test_all.py 1.5 => 1.5.6.1 ===
 import Zope
-from unittest import main
 from Products.CMFCore.tests.base.utils import build_test_suite
 
 def test_suite():
@@ -8,4 +8,4 @@
                              'test_Calendar'])
 
 if __name__ == '__main__':
-    main(defaultTest='test_suite')
+    unittest.main(defaultTest='test_suite')