[Checkins] SVN: zope.app.form/trunk/ Use zope.browserpage in favor of zope.app.pagetemplate.
Hanno Schlichting
hannosch at hannosch.eu
Tue Dec 22 14:05:22 EST 2009
Log message for revision 106909:
Use zope.browserpage in favor of zope.app.pagetemplate.
Changed:
U zope.app.form/trunk/CHANGES.txt
U zope.app.form/trunk/setup.py
U zope.app.form/trunk/src/zope/app/form/browser/add.py
U zope.app.form/trunk/src/zope/app/form/browser/editview.py
U zope.app.form/trunk/src/zope/app/form/browser/form.txt
U zope.app.form/trunk/src/zope/app/form/browser/itemswidgets.py
U zope.app.form/trunk/src/zope/app/form/browser/objectwidget.py
U zope.app.form/trunk/src/zope/app/form/browser/schemadisplay.py
U zope.app.form/trunk/src/zope/app/form/browser/sequencewidget.py
-=-
Modified: zope.app.form/trunk/CHANGES.txt
===================================================================
--- zope.app.form/trunk/CHANGES.txt 2009-12-22 19:01:04 UTC (rev 106908)
+++ zope.app.form/trunk/CHANGES.txt 2009-12-22 19:05:21 UTC (rev 106909)
@@ -2,9 +2,10 @@
CHANGES
=======
-3.11.2 (unreleased)
+3.12.0 (unreleased)
===================
+- Use zope.browserpage in favor of zope.app.pagetemplate.
3.11.1 (2009-12-22)
===================
Modified: zope.app.form/trunk/setup.py
===================================================================
--- zope.app.form/trunk/setup.py 2009-12-22 19:01:04 UTC (rev 106908)
+++ zope.app.form/trunk/setup.py 2009-12-22 19:05:21 UTC (rev 106909)
@@ -27,7 +27,7 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name='zope.app.form',
- version = '3.11.2dev',
+ version = '3.12.0dev',
author='Zope Corporation and Contributors',
author_email='zope-dev at zope.org',
description='The Original Zope 3 Form Framework',
@@ -79,8 +79,8 @@
install_requires=[
"setuptools",
"transaction",
- "zope.app.pagetemplate",
- "zope.browser >= 1.1",
+ "zope.browser>=1.1",
+ "zope.browserpage>=3.10.1",
"zope.browsermenu",
"zope.component",
"zope.configuration",
Modified: zope.app.form/trunk/src/zope/app/form/browser/add.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/add.py 2009-12-22 19:01:04 UTC (rev 106908)
+++ zope.app.form/trunk/src/zope/app/form/browser/add.py 2009-12-22 19:05:21 UTC (rev 106909)
@@ -32,8 +32,8 @@
from zope.app.form.utility import setUpWidgets, getWidgetsData
from zope.app.form.interfaces import IInputWidget, WidgetsError
from zope.app.form.browser.i18n import _
-from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from zope.browserpage.simpleviewclass import SimpleViewClass
+from zope.browserpage import ViewPageTemplateFile
from editview import EditView
from submit import Update
Modified: zope.app.form/trunk/src/zope/app/form/browser/editview.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/editview.py 2009-12-22 19:01:04 UTC (rev 106908)
+++ zope.app.form/trunk/src/zope/app/form/browser/editview.py 2009-12-22 19:05:21 UTC (rev 106909)
@@ -30,8 +30,8 @@
from zope.lifecycleevent import ObjectModifiedEvent
from zope.lifecycleevent import Attributes
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
+from zope.browserpage import ViewPageTemplateFile
+from zope.browserpage.simpleviewclass import SimpleViewClass
from zope.app.form.interfaces import WidgetsError
from zope.app.form.utility import setUpEditWidgets, applyWidgetsChanges
from zope.app.form.browser.i18n import _
Modified: zope.app.form/trunk/src/zope/app/form/browser/form.txt
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/form.txt 2009-12-22 19:01:04 UTC (rev 106908)
+++ zope.app.form/trunk/src/zope/app/form/browser/form.txt 2009-12-22 19:05:21 UTC (rev 106909)
@@ -161,7 +161,7 @@
>>> queryMultiAdapter(
... (Anything(), TestRequest()), name='name.html') #doctest:+ELLIPSIS
- <zope.app.pagetemplate.simpleviewclass.SimpleViewClass from edit.pt ...>
+ <zope.browserpage.simpleviewclass.SimpleViewClass from edit.pt ...>
Now, if I do not specify my own template, and my class does not overwrite the
Modified: zope.app.form/trunk/src/zope/app/form/browser/itemswidgets.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/itemswidgets.py 2009-12-22 19:01:04 UTC (rev 106908)
+++ zope.app.form/trunk/src/zope/app/form/browser/itemswidgets.py 2009-12-22 19:05:21 UTC (rev 106909)
@@ -28,7 +28,7 @@
from zope.app.form.interfaces import IInputWidget, IDisplayWidget
from zope.app.form.interfaces import ConversionError
from zope.app.form.browser.i18n import _
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from zope.browserpage import ViewPageTemplateFile
# For choices, we want to make the widget a view of the field and vocabulary.
Modified: zope.app.form/trunk/src/zope/app/form/browser/objectwidget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/objectwidget.py 2009-12-22 19:01:04 UTC (rev 106908)
+++ zope.app.form/trunk/src/zope/app/form/browser/objectwidget.py 2009-12-22 19:05:21 UTC (rev 106909)
@@ -25,7 +25,7 @@
from zope.app.form import InputWidget
from zope.app.form.browser.widget import BrowserWidget
from zope.app.form.utility import setUpWidgets, applyWidgetsChanges
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from zope.browserpage import ViewPageTemplateFile
from zope.app.form.browser.interfaces import IWidgetInputErrorView
@@ -104,7 +104,7 @@
"""Render the object as hidden fields."""
result = []
for name in self.names:
- result.append(getSubwidget(name).hidden())
+ result.append(self.getSubwidget(name).hidden())
return "".join(result)
def error(self):
Modified: zope.app.form/trunk/src/zope/app/form/browser/schemadisplay.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/schemadisplay.py 2009-12-22 19:01:04 UTC (rev 106908)
+++ zope.app.form/trunk/src/zope/app/form/browser/schemadisplay.py 2009-12-22 19:05:21 UTC (rev 106909)
@@ -25,8 +25,8 @@
from zope.security.checker import defineChecker, NamesChecker
from zope.app.form.utility import setUpDisplayWidgets
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
+from zope.browserpage import ViewPageTemplateFile
+from zope.browserpage.simpleviewclass import SimpleViewClass
class DisplayView(BrowserView):
"""Simple display-view base class.
Modified: zope.app.form/trunk/src/zope/app/form/browser/sequencewidget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/sequencewidget.py 2009-12-22 19:01:04 UTC (rev 106908)
+++ zope.app.form/trunk/src/zope/app/form/browser/sequencewidget.py 2009-12-22 19:05:21 UTC (rev 106909)
@@ -28,7 +28,7 @@
from zope.app.form.browser.i18n import _
from zope.app.form.browser.widget import BrowserWidget
from zope.app.form.browser.widget import DisplayWidget, renderElement
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from zope.browserpage import ViewPageTemplateFile
class SequenceWidget(BrowserWidget, InputWidget):
More information about the checkins
mailing list