Skip to content
This repository has been archived by the owner on Apr 9, 2019. It is now read-only.

Commit

Permalink
Use ViewPageTemplateFile from zope.browserpage.
Browse files Browse the repository at this point in the history
  • Loading branch information
hannosch committed May 19, 2012
1 parent 687310a commit 860b3ca
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
3 changes: 3 additions & 0 deletions docs/HISTORY.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ Changelog
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]
Expand Down
2 changes: 1 addition & 1 deletion plone/z3cform/crud/crud.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions plone/z3cform/templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import os
import zope.publisher.browser
import zope.app.pagetemplate.viewpagetemplatefile

import z3c.form.interfaces
import z3c.form.form
Expand All @@ -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
Expand Down
7 changes: 2 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os

version = '0.7.9dev'
version = '0.8.0dev'


def description():
Expand Down Expand Up @@ -31,15 +31,12 @@ def description():
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',
],
Expand Down

0 comments on commit 860b3ca

Please sign in to comment.