[Checkins] SVN: Products.CMFCalendar/trunk/Products/CMFCalendar/ Fixed ViewPageTemplateFile import to use the correct version from Five.

[Hanno Schlichting]

Log message for revision 106962:
  Fixed ViewPageTemplateFile import to use the correct version from Five.
  

Changed:
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.py

-=-
Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2009-12-22 22:28:19 UTC (rev 106961)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2009-12-22 22:33:52 UTC (rev 106962)
@@ -4,6 +4,7 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Fixed ViewPageTemplateFile import to use the correct version from Five.
 
 2.2.0-beta (2009-12-06)
 -----------------------

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.py	2009-12-22 22:28:19 UTC (rev 106961)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.py	2009-12-22 22:33:52 UTC (rev 106962)
@@ -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,20 +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):
 
     """Vocabulary factory for available event types.