[Checkins] SVN: z3c.formdemo/trunk/ Update to latest package versions and get ready for release.
Stephan Richter
srichter at gmail.com
Thu Jul 23 02:40:00 EDT 2009
Log message for revision 102109:
Update to latest package versions and get ready for release.
Changed:
U z3c.formdemo/trunk/CHANGES.txt
U z3c.formdemo/trunk/buildout.cfg
U z3c.formdemo/trunk/setup.py
U z3c.formdemo/trunk/src/z3c/formdemo/addressbook/browser.py
U z3c.formdemo/trunk/src/z3c/formdemo/addressbook/configure.zcml
U z3c.formdemo/trunk/src/z3c/formdemo/addressbook/contact.py
U z3c.formdemo/trunk/src/z3c/formdemo/application.zcml
U z3c.formdemo/trunk/src/z3c/formdemo/skin/configure.zcml
U z3c.formdemo/trunk/src/z3c/formdemo/spreadsheet/README.txt
U z3c.formdemo/trunk/src/z3c/formdemo/spreadsheet/configure.zcml
U z3c.formdemo/trunk/src/z3c/formdemo/widgets/configure.zcml
-=-
Modified: z3c.formdemo/trunk/CHANGES.txt
===================================================================
--- z3c.formdemo/trunk/CHANGES.txt 2009-07-23 05:05:18 UTC (rev 102108)
+++ z3c.formdemo/trunk/CHANGES.txt 2009-07-23 06:40:00 UTC (rev 102109)
@@ -2,10 +2,10 @@
CHANGES
=======
-Version 2.1.0 (unreleased)
+Version 2.1.0 (2009-07-23)
--------------------------
-- ...
+- Feature: Updated tests and code to latest pacakge versions.
Version 2.0.0 (2009-06-14)
--------------------------
Modified: z3c.formdemo/trunk/buildout.cfg
===================================================================
--- z3c.formdemo/trunk/buildout.cfg 2009-07-23 05:05:18 UTC (rev 102108)
+++ z3c.formdemo/trunk/buildout.cfg 2009-07-23 06:40:00 UTC (rev 102109)
@@ -1,8 +1,6 @@
[buildout]
-extends = http://download.zope.org/zope3.4/3.4.0/versions.cfg
develop = .
parts = demo test coverage eggdeps
-versions = versions
[test]
recipe = zc.recipe.testrunner
@@ -37,12 +35,5 @@
[database]
recipe = zc.recipe.filestorage
-[versions]
-lxml = 2.1.2
-z3c.formdemo =
-z3c.form =
-z3c.formui =
-zope.container = 3.7.0
-
[options]
port = 8080
Modified: z3c.formdemo/trunk/setup.py
===================================================================
--- z3c.formdemo/trunk/setup.py 2009-07-23 05:05:18 UTC (rev 102108)
+++ z3c.formdemo/trunk/setup.py 2009-07-23 06:40:00 UTC (rev 102109)
@@ -23,7 +23,7 @@
setup (
name='z3c.formdemo',
- version='2.1.0dev',
+ version='2.1.0',
author = "Stephan Richter, Roger Ineichen and the Zope Community",
author_email = "zope-dev at zope.org",
description = "A set of demo applications for z3c.form and z3c.formui",
@@ -52,10 +52,10 @@
extras_require = dict(
app = ['zope.app.appsetup',
'zope.app.authentication',
- 'zope.app.component',
'zope.app.container',
'zope.app.error',
'zope.app.form',
+ 'zope.app.i18n',
'zope.app.publisher',
'zope.app.publication',
'zope.app.security',
@@ -63,6 +63,7 @@
'zope.app.twisted',
'zope.app.wsgi',
'zope.contentprovider',
+ 'zope.site',
],
test = ['z3c.coverage',
'z3c.etestbrowser',
@@ -73,18 +74,18 @@
'z3c.csvvocabulary',
'z3c.form',
'z3c.formui',
- 'z3c.layer',
+ 'z3c.layer.pagelet',
'z3c.pagelet',
'z3c.template',
- 'z3c.viewlet',
'z3c.zrtresource',
'zc.resourcelibrary',
'zc.table',
'zope.annotation',
'zope.app.container',
+ 'zope.app.folder',
'zope.app.pagetemplate',
'zope.app.session',
- 'zope.component',
+ 'zope.component [zcml]',
'zope.interface',
'zope.location',
'zope.pagetemplate',
Modified: z3c.formdemo/trunk/src/z3c/formdemo/addressbook/browser.py
===================================================================
--- z3c.formdemo/trunk/src/z3c/formdemo/addressbook/browser.py 2009-07-23 05:05:18 UTC (rev 102108)
+++ z3c.formdemo/trunk/src/z3c/formdemo/addressbook/browser.py 2009-07-23 06:40:00 UTC (rev 102109)
@@ -18,10 +18,10 @@
__docformat__ = "reStructuredText"
import zope.component
import zope.location
-from zope.app.container import btree
from zope.session.interfaces import ISession
from zope.pagetemplate.interfaces import IPageTemplate
from zope.publisher import browser
+from zope.security.proxy import removeSecurityProxy
from zope.traversing.browser import absoluteURL
from zope.viewlet.viewlet import CSSViewlet, JavaScriptViewlet
from z3c.template.interfaces import ILayoutTemplate
@@ -96,7 +96,7 @@
# container in a session variable.
session = ISession(self.request)[SESSION_KEY]
if 'addresses' not in session:
- session['addresses'] = btree.BTreeContainer()
+ session['addresses'] = contact.Addresses()
return session['addresses']
def update(self):
@@ -381,7 +381,9 @@
return session.get('selectedContact')
def set(self, value):
session = ISession(self.request)[SESSION_KEY]
- session['selectedContact'] = value
+ # The session data is stored in the ZODB, so we must remove
+ # security proxies.
+ session['selectedContact'] = removeSecurityProxy(value)
return property(get, set)
def update(self):
Modified: z3c.formdemo/trunk/src/z3c/formdemo/addressbook/configure.zcml
===================================================================
--- z3c.formdemo/trunk/src/z3c/formdemo/addressbook/configure.zcml 2009-07-23 05:05:18 UTC (rev 102108)
+++ z3c.formdemo/trunk/src/z3c/formdemo/addressbook/configure.zcml 2009-07-23 06:40:00 UTC (rev 102109)
@@ -6,12 +6,21 @@
<!-- Content Security Declarations -->
+ <class class=".contact.Addresses">
+ <allow interface="zope.container.interfaces.IContainer" />
+ </class>
+
<class class=".contact.Address">
<allow interface=".interfaces.IAddress" />
<require permission="zope.Public"
set_schema=".interfaces.IAddress" />
</class>
+ <class class=".contact.EMails">
+ <allow interface="zope.interface.common.sequence.ISequence"
+ attributes="__iter__" />
+ </class>
+
<class class=".contact.EMail">
<allow interface=".interfaces.IEMail" />
<require permission="zope.Public"
Modified: z3c.formdemo/trunk/src/z3c/formdemo/addressbook/contact.py
===================================================================
--- z3c.formdemo/trunk/src/z3c/formdemo/addressbook/contact.py 2009-07-23 05:05:18 UTC (rev 102108)
+++ z3c.formdemo/trunk/src/z3c/formdemo/addressbook/contact.py 2009-07-23 06:40:00 UTC (rev 102109)
@@ -19,11 +19,13 @@
import persistent
import zope.interface
import zope.location
-from zope.app.container import contained
+from zope.container import contained, btree
from zope.schema.fieldproperty import FieldProperty
from z3c.formdemo.addressbook import interfaces
+class Addresses(btree.BTreeContainer):
+ pass
class Address(contained.Contained, persistent.Persistent):
zope.interface.implements(interfaces.IAddress)
Modified: z3c.formdemo/trunk/src/z3c/formdemo/application.zcml
===================================================================
--- z3c.formdemo/trunk/src/z3c/formdemo/application.zcml 2009-07-23 05:05:18 UTC (rev 102108)
+++ z3c.formdemo/trunk/src/z3c/formdemo/application.zcml 2009-07-23 06:40:00 UTC (rev 102109)
@@ -3,14 +3,13 @@
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="demo">
- <include package="zope.app.component" file="meta.zcml" />
- <include package="zope.app.component.browser" file="meta.zcml" />
<include package="zope.app.form.browser" file="meta.zcml" />
<include package="zope.app.pagetemplate" file="meta.zcml" />
<include package="zope.app.publication" file="meta.zcml" />
<include package="zope.app.publisher" file="meta.zcml" />
<include package="zope.app.security" file="meta.zcml" />
<include package="zope.app.securitypolicy" file="meta.zcml" />
+ <include package="zope.component" file="meta.zcml" />
<include package="zope.i18n" file="meta.zcml" />
<include package="zope.rdb" file="meta.zcml" />
<include package="zope.viewlet" file="meta.zcml" />
@@ -25,11 +24,11 @@
<browser:menu id="zmi_actions" title="Actions" />
<include package="zope.app.appsetup" />
- <include package="zope.app.component" />
<include package="zope.app.container" />
<include package="zope.app.error" />
<include package="zope.app.i18n" />
<include package="zope.app.publication" />
+ <include package="zope.app.publisher" />
<include package="zope.app.security" />
<include package="zope.app.securitypolicy" />
<include package="zope.app.session" />
@@ -41,6 +40,7 @@
<include package="zope.location" />
<include package="zope.publisher" />
<include package="zope.rdb" />
+ <include package="zope.site" />
<include package="zope.traversing" />
<include package="zope.traversing.browser" />
<include package="zope.viewlet" />
Modified: z3c.formdemo/trunk/src/z3c/formdemo/skin/configure.zcml
===================================================================
--- z3c.formdemo/trunk/src/z3c/formdemo/skin/configure.zcml 2009-07-23 05:05:18 UTC (rev 102108)
+++ z3c.formdemo/trunk/src/z3c/formdemo/skin/configure.zcml 2009-07-23 06:40:00 UTC (rev 102109)
@@ -35,7 +35,7 @@
<viewletManager
name="ICSS"
provides="z3c.formdemo.skin.ICSS"
- class="z3c.viewlet.manager.WeightOrderedViewletManager"
+ class="zope.viewlet.manager.WeightOrderedViewletManager"
layer="z3c.formdemo.layer.IDemoBrowserLayer"
permission="zope.Public"
/>
@@ -43,7 +43,7 @@
<viewletManager
name="IJavaScript"
provides="z3c.formdemo.skin.IJavaScript"
- class="z3c.viewlet.manager.WeightOrderedViewletManager"
+ class="zope.viewlet.manager.WeightOrderedViewletManager"
layer="z3c.formdemo.layer.IDemoBrowserLayer"
permission="zope.Public"
/>
Modified: z3c.formdemo/trunk/src/z3c/formdemo/spreadsheet/README.txt
===================================================================
--- z3c.formdemo/trunk/src/z3c/formdemo/spreadsheet/README.txt 2009-07-23 05:05:18 UTC (rev 102108)
+++ z3c.formdemo/trunk/src/z3c/formdemo/spreadsheet/README.txt 2009-07-23 06:40:00 UTC (rev 102109)
@@ -12,6 +12,7 @@
>>> from z3c.etestbrowser.testing import ExtendedTestBrowser
>>> user = ExtendedTestBrowser()
>>> user.addHeader('Accept-Language', 'en')
+ >>> user.handleErrors = False
>>> user.open('http://localhost:8080')
Since all demos are purely public, there is no need to log in. Let's now click
Modified: z3c.formdemo/trunk/src/z3c/formdemo/spreadsheet/configure.zcml
===================================================================
--- z3c.formdemo/trunk/src/z3c/formdemo/spreadsheet/configure.zcml 2009-07-23 05:05:18 UTC (rev 102108)
+++ z3c.formdemo/trunk/src/z3c/formdemo/spreadsheet/configure.zcml 2009-07-23 06:40:00 UTC (rev 102109)
@@ -1,24 +1,34 @@
<configure
- xmlns="http://namespaces.zope.org/browser"
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:browser="http://namespaces.zope.org/browser"
xmlns:z3c="http://namespaces.zope.org/z3c"
i18n_domain="z3c.formdemo">
+ <!-- Security Declarations -->
+
+ <class class=".content.Candidate">
+ <allow interface=".content.ICandidate" />
+ <require permission="zope.Public"
+ set_schema=".content.ICandidate" />
+ </class>
+
+
<!-- Resources -->
- <resourceDirectory
+ <browser:resourceDirectory
name="SpreadsheetImages"
directory="images/"
layer="z3c.formdemo.layer.IDemoBrowserLayer"
permission="zope.Public"
/>
- <zrt-resource
+ <browser:zrt-resource
name="spreadsheet.css"
file="spreadsheet.css"
layer="z3c.formdemo.layer.IDemoBrowserLayer"
/>
- <viewlet
+ <browser:viewlet
name="spreadsheet.css"
view=".browser.CandidateSpreadsheet"
manager="z3c.formdemo.skin.ICSS"
Modified: z3c.formdemo/trunk/src/z3c/formdemo/widgets/configure.zcml
===================================================================
--- z3c.formdemo/trunk/src/z3c/formdemo/widgets/configure.zcml 2009-07-23 05:05:18 UTC (rev 102108)
+++ z3c.formdemo/trunk/src/z3c/formdemo/widgets/configure.zcml 2009-07-23 06:40:00 UTC (rev 102109)
@@ -18,8 +18,18 @@
permission="zope.Public"
/>
+ <class class=".browser.AllFields">
+ <require
+ permission="zope.Public"
+ interface=".interfaces.IAllFields" />
+ <require
+ permission="zope.Public"
+ set_schema=".interfaces.IAllFields" />
+ </class>
+
<adapter
factory=".browser.getAllFields"
+ trusted="true"
/>
</configure>
More information about the Checkins
mailing list