[CMF-checkins] CVS: Products/CMFCalendar - DEPENDENCIES.txt:1.7 Event.py:1.24

[Tres Seaver]

Update of /cvs-repository/Products/CMFCalendar
In directory cvs.zope.org:/tmp/cvs-serv19326/CMFCalendar

Modified Files:
	DEPENDENCIES.txt Event.py 
Log Message:
 - Merge tseaver-z28_only-branch, removing BBB for Zope 2.7 support.


=== Products/CMFCalendar/DEPENDENCIES.txt 1.6 => 1.7 ===
--- Products/CMFCalendar/DEPENDENCIES.txt:1.6	Wed Mar 16 06:12:44 2005
+++ Products/CMFCalendar/DEPENDENCIES.txt	Wed Jun 15 10:17:37 2005
@@ -1,4 +1,4 @@
-Zope >= 2.7.0
+Zope >= 2.8.0
 CMFCore
 CMFDefault
 CMFSetup


=== Products/CMFCalendar/Event.py 1.23 => 1.24 ===
--- Products/CMFCalendar/Event.py:1.23	Tue Apr  5 06:48:44 2005
+++ Products/CMFCalendar/Event.py	Wed Jun 15 10:17:37 2005
@@ -18,11 +18,7 @@
 from AccessControl import ClassSecurityInfo
 from DateTime import DateTime
 from Globals import InitializeClass
-try:
-    import transaction
-except ImportError:
-    # BBB: for Zope 2.7
-    from Products.CMFCore.utils import transaction
+import transaction
 
 from Products.CMFCore.PortalContent import PortalContent
 from Products.CMFCore.utils import contributorsplitter