[Checkins] SVN: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/ Fixed ViewPageTemplateFile import to use the correct version from Five and backported some test setup fixes

[Hanno Schlichting]

Log message for revision 113210:
  Fixed ViewPageTemplateFile import to use the correct version from Five and backported some test setup fixes
  

Changed:
  U   Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt
  U   Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/configure.zcml
  U   Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/event.py
  U   Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/tests.py

-=-
Modified: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt
===================================================================
--- Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt	2010-06-06 15:01:26 UTC (rev 113209)
+++ Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt	2010-06-06 15:09:46 UTC (rev 113210)
@@ -4,6 +4,8 @@
 2.2.1-beta (unreleased)
 -----------------------
 
+- Fixed ViewPageTemplateFile import to use the correct version from Five.
+
 - Deal with deprecation warnings for Zope 2.13.
 
 

Modified: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/configure.zcml
===================================================================
--- Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/configure.zcml	2010-06-06 15:01:26 UTC (rev 113209)
+++ Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/configure.zcml	2010-06-06 15:09:46 UTC (rev 113210)
@@ -4,6 +4,8 @@
 
   <adapter factory=".event.EventSchemaAdapter"/>
 
+  <include package="Products.CMFCore" file="permissions.zcml"/>
+
   <utility
       component=".event.EventTypeVocabularyFactory"
       name="cmf.calendar.AvailableEventTypes"

Modified: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/event.py
===================================================================
--- Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/event.py	2010-06-06 15:01:26 UTC (rev 113209)
+++ Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/event.py	2010-06-06 15:09:46 UTC (rev 113210)
@@ -15,6 +15,8 @@
 $Id$
 """
 
+import time
+
 from zope.app.form.browser import DatetimeI18nWidget
 from zope.component import adapts
 from zope.component import getUtility
@@ -30,19 +32,18 @@
 from zope.schema.interfaces import IVocabularyFactory
 
 from Products.CMFCore.interfaces import IMetadataTool
+from Products.CMFDefault.browser.utils import decode, ViewBase
 from Products.CMFDefault.formlib.form import ContentEditFormBase
 from Products.CMFDefault.formlib.form import DisplayFormBase
 from Products.CMFDefault.formlib.schema import EmailLine
 from Products.CMFDefault.formlib.schema import ProxyFieldProperty
 from Products.CMFDefault.formlib.schema import SchemaAdapterBase
 from Products.CMFDefault.formlib.vocabulary import SimpleVocabulary
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 
 from Products.CMFCalendar.interfaces import IMutableEvent
 from Products.CMFCalendar.utils import Message as _
 
-from zope.app.pagetemplate import ViewPageTemplateFile
-from Products.CMFDefault.browser.utils import decode, ViewBase
-import time
 
 class EventTypeVocabulary(object):
 

Modified: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/tests.py
===================================================================
--- Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/tests.py	2010-06-06 15:01:26 UTC (rev 113209)
+++ Products.CMFCalendar/branches/2.2/Products/CMFCalendar/browser/tests.py	2010-06-06 15:09:46 UTC (rev 113210)
@@ -17,7 +17,10 @@
 
 import unittest
 from Testing import ZopeTestCase
-from Products.Five.schema import Zope2VocabularyRegistry
+try:
+    from Zope2.App.schema import Zope2VocabularyRegistry
+except ImportError:  # Zope2 <= 2.12
+    from Products.Five.schema import Zope2VocabularyRegistry
 
 from Products.CMFCalendar.testing import FunctionalLayer