[Checkins] SVN: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/ Backport c121603 from trunk

[Hanno Schlichting]

Log message for revision 121612:
  Backport c121603 from trunk
  

Changed:
  U   Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt
  U   Products.CMFCalendar/branches/2.2/Products/CMFCalendar/tests/test_Event.py

-=-
Modified: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt
===================================================================
--- Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt	2011-05-08 16:50:34 UTC (rev 121611)
+++ Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt	2011-05-08 16:52:46 UTC (rev 121612)
@@ -4,6 +4,7 @@
 2.2.3 (unreleased)
 ------------------
 
+- Fixed tests to be compatibility with DateTime 3.
 
 2.2.2 (2010-10-31)
 ------------------

Modified: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/tests/test_Event.py
===================================================================
--- Products.CMFCalendar/branches/2.2/Products/CMFCalendar/tests/test_Event.py	2011-05-08 16:50:34 UTC (rev 121611)
+++ Products.CMFCalendar/branches/2.2/Products/CMFCalendar/tests/test_Event.py	2011-05-08 16:52:46 UTC (rev 121612)
@@ -19,6 +19,7 @@
 import Testing
 
 from DateTime import DateTime
+from DateTime.interfaces import DateError
 from zope.interface.verify import verifyClass
 
 from Products.CMFCore.testing import ConformsToContent
@@ -79,7 +80,7 @@
     def test_puke(self):
         event = self._makeOne('shouldPuke')
 
-        self.assertRaises( DateTime.DateError
+        self.assertRaises( DateError
                          , event.edit
                          , effectiveDay=31
                          , effectiveMo=2