[Checkins] SVN: plone.z3cform/trunk/ Use ViewPageTemplateFile from zope.browserpage.

Hano Schlichting cvs-admin at zope.org
Sat May 19 16:26:31 UTC 2012


Log message for revision 126390:
  Use ViewPageTemplateFile from zope.browserpage.
  

Changed:
  U   plone.z3cform/trunk/docs/HISTORY.txt
  U   plone.z3cform/trunk/plone/z3cform/crud/crud.py
  U   plone.z3cform/trunk/plone/z3cform/templates.py
  U   plone.z3cform/trunk/setup.py

-=-
Modified: plone.z3cform/trunk/docs/HISTORY.txt
===================================================================
--- plone.z3cform/trunk/docs/HISTORY.txt	2012-05-19 16:02:12 UTC (rev 126389)
+++ plone.z3cform/trunk/docs/HISTORY.txt	2012-05-19 16:26:28 UTC (rev 126390)
@@ -4,6 +4,9 @@
 0.8 - unreleased
 ----------------
 
+* Use ViewPageTemplateFile from zope.browserpage.
+  [hannosch]
+
 * Use form action URL as given by the view, instead of implementing it
   in the template as a call to the ``getURL`` method of the request.
   [malthe]

Modified: plone.z3cform/trunk/plone/z3cform/crud/crud.py
===================================================================
--- plone.z3cform/trunk/plone/z3cform/crud/crud.py	2012-05-19 16:02:12 UTC (rev 126389)
+++ plone.z3cform/trunk/plone/z3cform/crud/crud.py	2012-05-19 16:26:28 UTC (rev 126390)
@@ -10,7 +10,7 @@
 from z3c.form import form
 import z3c.form.widget
 from z3c.form.interfaces import DISPLAY_MODE, INPUT_MODE, NOVALUE
-from zope.app.pagetemplate import viewpagetemplatefile
+from zope.browserpage import viewpagetemplatefile
 
 from plone.batching import Batch
 from plone.batching.browser import BatchView

Modified: plone.z3cform/trunk/plone/z3cform/templates.py
===================================================================
--- plone.z3cform/trunk/plone/z3cform/templates.py	2012-05-19 16:02:12 UTC (rev 126389)
+++ plone.z3cform/trunk/plone/z3cform/templates.py	2012-05-19 16:26:28 UTC (rev 126390)
@@ -9,7 +9,6 @@
 
 import os
 import zope.publisher.browser
-import zope.app.pagetemplate.viewpagetemplatefile
 
 import z3c.form.interfaces
 import z3c.form.form
@@ -25,7 +24,7 @@
 except ImportError:
     # standard Zope page templates
     from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile as ZopeTwoPageTemplateFile
-    from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+    from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
 
 import plone.z3cform
 import plone.z3cform.layout

Modified: plone.z3cform/trunk/setup.py
===================================================================
--- plone.z3cform/trunk/setup.py	2012-05-19 16:02:12 UTC (rev 126389)
+++ plone.z3cform/trunk/setup.py	2012-05-19 16:26:28 UTC (rev 126390)
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '0.7.9dev'
+version = '0.8.0dev'
 
 
 def description():
@@ -31,15 +31,12 @@
       namespace_packages=['plone'],
       include_package_data=True,
       zip_safe=False,
-
-      # If in Zope 2, z3c.form or another Zope 3 package starts
-      # pulling incompatible dependencies, use the "fake zope eggs"
-      # feature of plone.recipe.zope2install.
       install_requires=[
           'setuptools',
           'plone.batching',
           'z3c.form',
           'zope.i18n>=3.4',
+          'zope.browserpage',
           'zope.component',
           'collective.monkeypatcher',
       ],



More information about the checkins mailing list