[Checkins] SVN: grok/trunk/ merge -r 105539:105663 svn+ssh://svn.zope.org/repos/main/grok/branches/d2m-ztk-support
Jan-Wijbrand Kolman
janwijbrand at gmail.com
Mon Nov 16 15:52:06 EST 2009
Log message for revision 105731:
merge -r 105539:105663 svn+ssh://svn.zope.org/repos/main/grok/branches/d2m-ztk-support
Changed:
U grok/trunk/CHANGES.txt
U grok/trunk/CREDITS.txt
U grok/trunk/doc/conf.py
U grok/trunk/doc/layout.html
U grok/trunk/grokdocs/setup.py
U grok/trunk/grokdocs/src/grokdocs/latex_hacks.py
U grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py
U grok/trunk/src/grok/ftests/catalog/indexes_name.py
U grok/trunk/src/grok/ftests/lifecycle/create_application.py
U grok/trunk/src/grok/ftests/lifecycle/lifecycle_events.py
U grok/trunk/src/grok/ftests/site/site.py
U grok/trunk/src/grok/publication.py
U grok/trunk/src/grok/tests/container/orderedcontainer.py
U grok/trunk/versions.cfg
-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/CHANGES.txt 2009-11-16 20:52:06 UTC (rev 105731)
@@ -4,6 +4,12 @@
1.1 (unreleased)
================
+* This release depends on grokcore.view 1.13.
+
+* Add ZTK support (currently ZTK 1.0dev).
+
+* Grokdocs now uses ZTK pinned versions.
+
* The ``grok.permissions()``, that is used in the ``grok.Role`` component now
accepts references to ``grok.Permission`` class, not just permission ids.
This behaviour is now symetrical to the ``grok.require()`` directive.
@@ -27,7 +33,7 @@
* Fix documentation bug where virtualenv wasn't explained correctly.
-* Remove the ``grok.View`` permission declaration in ``etc/site.zcml.in``,
+* Remove the ``grok.View`` permission declaration in ``etc/site.zcml.in``,
should have gone in 1.0b2 already
1.0 (2009-10-07)
Modified: grok/trunk/CREDITS.txt
===================================================================
--- grok/trunk/CREDITS.txt 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/CREDITS.txt 2009-11-16 20:52:06 UTC (rev 105731)
@@ -44,7 +44,7 @@
* Sylvain Viollon (work on martian, grokcore.formlib, grokcore.view,
grokcore.viewlet)
-* Michael Haubenwallner (WSGI support)
+* Michael Haubenwallner (WSGI support, ZTK support)
* ME GROK (team mascot)
Modified: grok/trunk/doc/conf.py
===================================================================
--- grok/trunk/doc/conf.py 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/doc/conf.py 2009-11-16 20:52:06 UTC (rev 105731)
@@ -19,15 +19,13 @@
version = 'Unknown'
setupfilepath = path.join(path.dirname(path.abspath(curdir)), 'setup.py')
-reg = re.compile("^\s*version=.(.+).,.*")
-for line in open(setupfilepath, 'r').read().split():
+reg = re.compile("^\s*version = .(.+).,.*")
+for line in open(setupfilepath, 'r').read().split('\n'):
m = reg.match(line)
if m:
version = m.groups()[0]
-
-
# If your extensions are in another directory, add it here.
#sys.path.append('some/directory')
@@ -49,7 +47,7 @@
# General substitutions.
project = 'Official Grok'
-copyright = '2006-2008, The Zope Foundation'
+copyright = '2006-2009, The Zope Foundation'
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
Modified: grok/trunk/doc/layout.html
===================================================================
--- grok/trunk/doc/layout.html 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/doc/layout.html 2009-11-16 20:52:06 UTC (rev 105731)
@@ -4,7 +4,7 @@
{%- endblock %}
{%- set reldelim1 = reldelim1 is not defined and ' »' or reldelim1 %}
{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
-{%- macro relbar %}
+{%- macro relbar() %}
<div class="header">
{%- block rootrellink %}
<a href="{{ pathto('index') }}">Official Grok Documentation</a> version {{ release }}
@@ -25,7 +25,7 @@
</div>
</div>
{%- endmacro %}
-{%- macro sidebar %}
+{%- macro sidebar() %}
{%- if builder != 'htmlhelp' %}
<div class="sphinxsidebar">
<div class="sphinxsidebarwrapper">
Modified: grok/trunk/grokdocs/setup.py
===================================================================
--- grok/trunk/grokdocs/setup.py 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/grokdocs/setup.py 2009-11-16 20:52:06 UTC (rev 105731)
@@ -9,9 +9,9 @@
description="""\
Grokdocs: Build the Grok documentation in different formats!
""",
- install_requires=['docutils==0.4',
- 'Sphinx==0.4',
- 'Pygments==0.8.1',
+ install_requires=['docutils',
+ 'Sphinx',
+ 'Pygments',
],
package_dir = {'': 'src'},
packages=find_packages('src'),
Modified: grok/trunk/grokdocs/src/grokdocs/latex_hacks.py
===================================================================
--- grok/trunk/grokdocs/src/grokdocs/latex_hacks.py 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/grokdocs/src/grokdocs/latex_hacks.py 2009-11-16 20:52:06 UTC (rev 105731)
@@ -21,7 +21,7 @@
"""
from docutils import nodes
-from sphinx.latexwriter import LaTeXTranslator
+from sphinx.writers.latex import LaTeXTranslator
# Inject a working pygments workaround.
def depart_literal_block(self, node):
Modified: grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py 2009-11-16 20:52:06 UTC (rev 105731)
@@ -10,10 +10,7 @@
>>> getRootFolder()['herd'] = herd
Traceback (most recent call last):
...
- GrokError: grok.Indexes in module <module
- 'grok.ftests.catalog.indexes_multiple_conflict' from ...>
- causes creation of catalog index 'name' in catalog u'', but an index
- with that name is already present.
+ KeyError: u'name'
>>> from zope.app.component.hooks import setSite
>>> setSite(herd)
Modified: grok/trunk/src/grok/ftests/catalog/indexes_name.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_name.py 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/src/grok/ftests/catalog/indexes_name.py 2009-11-16 20:52:06 UTC (rev 105731)
@@ -17,7 +17,7 @@
>>> catalog = getUtility(ICatalog, 'foo_catalog')
>>> catalog
- <zope.app.catalog.catalog.Catalog object at ...>
+ <zope.catalog.catalog.Catalog object at ...>
Nuke the catalog and intids in the end, so as not to confuse
other tests::
Modified: grok/trunk/src/grok/ftests/lifecycle/create_application.py
===================================================================
--- grok/trunk/src/grok/ftests/lifecycle/create_application.py 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/src/grok/ftests/lifecycle/create_application.py 2009-11-16 20:52:06 UTC (rev 105731)
@@ -16,8 +16,8 @@
>>> import grok.util
>>> app = grok.util.create_application(Cave, root, 'mycave')
- Cave <zope.app.event.objectevent.ObjectCreatedEvent object at ...>
- Cave <zope.app.container.contained.ObjectAddedEvent object at ...>
+ Cave <zope.lifecycleevent.ObjectCreatedEvent object at ...>
+ Cave <zope.lifecycleevent.ObjectAddedEvent object at ...>
Cave <grok.events.ApplicationInitializedEvent object at ...>
As we can see, the events are effectively trigged, and in the right
@@ -26,7 +26,7 @@
>>> print app
<grok.ftests.lifecycle.create_application.Cave object at ...>
>>> print app.__parent__
- <zope.app.folder.folder.Folder object at ...>
+ <zope.site.folder.Folder object at ...>
However, if an error occurs during the creation process, the exception
is not caught by `create_application`.
Modified: grok/trunk/src/grok/ftests/lifecycle/lifecycle_events.py
===================================================================
--- grok/trunk/src/grok/ftests/lifecycle/lifecycle_events.py 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/src/grok/ftests/lifecycle/lifecycle_events.py 2009-11-16 20:52:06 UTC (rev 105731)
@@ -48,7 +48,7 @@
that we can now work on an operational environment:
>>> notify(grok.ApplicationInitializedEvent(site))
- <zope.app.catalog.catalog.Catalog object at ...>
+ <zope.catalog.catalog.Catalog object at ...>
"""
import grok
Modified: grok/trunk/src/grok/ftests/site/site.py
===================================================================
--- grok/trunk/src/grok/ftests/site/site.py 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/src/grok/ftests/site/site.py 2009-11-16 20:52:06 UTC (rev 105731)
@@ -3,7 +3,7 @@
grok.Container.
>>> from zope import interface
- >>> from zope.app.component.interfaces import IPossibleSite, ISite
+ >>> from zope.location.interfaces import IPossibleSite, ISite
>>> manfred = Mammoth()
>>> IPossibleSite.providedBy(manfred)
True
Modified: grok/trunk/src/grok/publication.py
===================================================================
--- grok/trunk/src/grok/publication.py 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/src/grok/publication.py 2009-11-16 20:52:06 UTC (rev 105731)
@@ -30,13 +30,13 @@
from zope.security.checker import selectChecker
from zope.publisher.publish import mapply
+from zope.publisher.interfaces.http import IHTTPException
from zope.publisher.interfaces.browser import IBrowserView
from zope.app.publication.http import BaseHTTPPublication, HTTPPublication
from zope.app.publication.browser import BrowserPublication
from zope.app.publication.requestpublicationfactories import \
BrowserFactory, XMLRPCFactory, HTTPFactory
-from zope.app.http.interfaces import IHTTPException
from grok.interfaces import IGrokSecurityView
Modified: grok/trunk/src/grok/tests/container/orderedcontainer.py
===================================================================
--- grok/trunk/src/grok/tests/container/orderedcontainer.py 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/src/grok/tests/container/orderedcontainer.py 2009-11-16 20:52:06 UTC (rev 105731)
@@ -57,7 +57,7 @@
>>> bones['shin'] = Bone('Another Shin Bone')
Traceback (most recent call last):
...
- DuplicationError: shin
+ KeyError: u'shin'
Reordering with a wrong set of keys should fail::
Modified: grok/trunk/versions.cfg
===================================================================
--- grok/trunk/versions.cfg 2009-11-16 20:47:56 UTC (rev 105730)
+++ grok/trunk/versions.cfg 2009-11-16 20:52:06 UTC (rev 105731)
@@ -1,114 +1,193 @@
[versions]
-ClientForm = 0.2.9
+# grok related
grokcore.annotation = 1.1
grokcore.component = 1.7
grokcore.formlib = 1.4
grokcore.security = 1.2
grokcore.site = 1.1
grokcore.startup = 0.4
-grokcore.view = 1.12.2
+grokcore.view = 1.13a1
grokcore.viewlet = 1.3
grokui.admin = 0.3.2
martian = 0.11.1
-mechanize = 0.1.7b
-pytz = 2009l
-RestrictedPython = 3.4.2
+Paste = 1.7.2
+PasteDeploy = 1.3.3
+PasteScript = 1.7.3
simplejson = 2.0.9
-z3c.autoinclude = 0.2.2
+z3c.autoinclude = 0.3.1
+z3c.evalexception = 2.0
z3c.flashmessage = 1.0
+z3c.recipe.dev = 0.5.4
z3c.recipe.eggbasket = 0.4.3
-z3c.testsetup = 0.4
-zc.catalog = 1.2.0
-ZConfig = 2.5.1
-zc.recipe.testrunner = 1.0.0
-zdaemon = 2.0.2
-ZODB3 = 3.8.3
-zodbcode = 3.4.0
-zope.annotation = 3.4.1
-zope.app.apidoc = 3.4.3
-zope.app.applicationcontrol = 3.4.3
-zope.app.appsetup = 3.4.1
-zope.app.authentication = 3.4.4
-zope.app.basicskin = 3.4.0
-zope.app.broken = 3.4.0
-zope.app.catalog = 3.5.1
-zope.app.component = 3.4.1
-zope.app.container = 3.5.6
+z3c.recipe.mkdir = 0.3.1
+z3c.recipe.template = 0.1
+z3c.testsetup = 0.5.1
+zc.catalog = 1.4.1
+zest.releaser = 2.10
+zope.app.session = 3.6.0
+
+# ZTK
+# http://svn.zope.org/*checkout*/zopetoolkit/trunk/ztk.cfg?rev=105404
+z3c.recipe.compattest = 0.8.0
+zope.annotation = 3.5.0
+zope.app.apidoc = 3.6.7
+zope.app.applicationcontrol = 3.5.1
+zope.app.appsetup = 3.12.0
+zope.app.authentication = 3.6.1
+zope.app.basicskin = 3.4.1
+zope.app.boston = 3.4.0
+zope.app.broken = 3.5.0
+zope.app.cache = 3.7.0
+zope.app.catalog = 3.8.0
+zope.app.component = 3.8.3
zope.app.content = 3.4.0
+zope.app.dav = 3.5.1
zope.app.debug = 3.4.1
+zope.app.debugskin = 3.4.0
zope.app.dependable = 3.4.0
-zope.app.error = 3.5.1
-zope.app.exception = 3.4.1
-zope.app.file = 3.4.4
-zope.app.folder = 3.4.0
-zope.app.form = 3.4.1
-zope.app.generations = 3.4.1
-zope.app.http = 3.4.1
-zope.app.i18n = 3.4.4
-zope.app.interface = 3.4.0
-zope.app.intid = 3.4.1
-zope.app.keyreference = 3.4.1
-zope.app.locales = 3.4.5
-zope.app.onlinehelp = 3.4.1
-zope.app.pagetemplate = 3.4.1
-zope.app.preference = 3.4.1
-zope.app.principalannotation = 3.4.0
-zope.app.publication = 3.4.3
-zope.app.publisher = 3.5.1
-zope.app.renderer = 3.4.0
-zope.app.rotterdam = 3.4.1
-zope.app.schema = 3.4.0
-zope.app.security = 3.5.2
-zope.app.securitypolicy = 3.4.6
+zope.app.dtmlpage = 3.5.0
+zope.app.error = 3.5.2
+zope.app.exception = 3.5.0
+zope.app.externaleditor = 3.5.0
+zope.app.file = 3.5.0
+zope.app.form = 3.8.1
+zope.app.ftp = 3.5.0
+zope.app.generations = 3.5.0
+zope.app.homefolder = 3.5.0
+zope.app.http = 3.6.0
+zope.app.i18n = 3.6.2
+zope.app.i18nfile = 3.4.1
+zope.app.interpreter = 3.4.0
+zope.app.locales = 3.5.1
+zope.app.locking = 3.5.0
+zope.app.onlinehelp = 3.5.1
+zope.app.pagetemplate = 3.7.1
+zope.app.preference = 3.6.0
+zope.app.preview = 3.4.0
+zope.app.principalannotation = 3.6.1
+zope.app.publication = 3.9.0
+zope.app.publisher = 3.10.0
+zope.app.pythonpage = 3.5.1
+zope.app.renderer = 3.5.1
+zope.app.rotterdam = 3.5.0
+zope.app.schema = 3.5.0
+zope.app.security = 3.7.2
+zope.app.securitypolicy = 3.5.1
zope.app.server = 3.4.2
-zope.app.session = 3.5.1
-zope.app.skins = 3.4.0
-zope.app.testing = 3.4.3
-zope.app.tree = 3.4.0
-zope.app.twisted = 3.4.1
-zope.app.wsgi = 3.4.2
-zope.app.zapi = 3.4.0
-zope.app.zcmlfiles = 3.4.3
-zope.app.zopeappgenerations = 3.4.0
-zope.cachedescriptors = 3.4.1
-zope.component = 3.4.0
-zope.configuration = 3.4.0
-zope.contentprovider = 3.4.0
-zope.contenttype = 3.4.0
-zope.copypastemove = 3.4.0
+zope.app.sqlscript = 3.5.0
+zope.app.testing = 3.7.3
+zope.app.tree = 3.6.0
+zope.app.twisted = 3.5.0
+zope.app.undo = 3.5.0
+zope.app.wsgi = 3.6.0
+zope.app.xmlrpcintrospection = 3.5.0
+zope.app.zcmlfiles = 3.6.0
+zope.app.zopeappgenerations = 3.5.0
+zope.app.zptpage = 3.5.0
+zope.browsermenu = 3.9.0
+zope.browserpage = 3.9.0
+zope.browserresource = 3.9.0
+zope.cachedescriptors = 3.5.0
+zope.catalog = 3.8.0
+zope.component = 3.7.1
+zope.configuration = 3.6.0
+zope.container = 3.9.0
+zope.contentprovider = 3.5.0
+zope.contenttype = 3.4.2
+zope.copy = 3.5.0
+zope.copypastemove = 3.5.2
zope.datetime = 3.4.0
-zope.deferredimport = 3.4.0
+zope.deferredimport = 3.5.0
zope.deprecation = 3.4.0
-zope.dottedname = 3.4.2
-zope.dublincore = 3.4.0
-zope.error = 3.5.1
-zope.event = 3.4.0
-zope.exceptions = 3.4.0
-zope.filerepresentation = 3.4.0
-zope.formlib = 3.4.0
-zope.hookable = 3.4.0
-zope.i18n = 3.4.0
-zope.i18nmessageid = 3.4.3
-zope.index = 3.4.1
-zope.interface = 3.4.1
-zope.lifecycleevent = 3.4.0
-zope.location = 3.4.0
-zope.minmax = 1.1.0
+zope.documenttemplate = 3.4.2
+zope.dottedname = 3.4.6
+zope.dublincore = 3.5.0
+zope.error = 3.7.0
+zope.event = 3.4.1
+zope.exceptions = 3.5.2
+zope.file = 0.5.0
+zope.filerepresentation = 3.5.0
+zope.formlib = 3.6.0
+zope.hookable = 3.4.1
+zope.html = 2.0.0
+zope.i18n = 3.7.1
+zope.i18nmessageid = 3.5.0
+zope.index = 3.6.0
+zope.interface = 3.5.2
+zope.intid = 3.7.1
+zope.keyreference = 3.6.2
+zope.lifecycleevent = 3.5.2
+zope.location = 3.7.0
+zope.mimetype = 1.1.2
+zope.minmax = 1.1.1
zope.modulealias = 3.4.0
-zope.pagetemplate = 3.4.0
-zope.proxy = 3.4.2
-zope.publisher = 3.4.9
-zope.schema = 3.4.0
-zope.security = 3.4.1
-zope.securitypolicy = 3.4.1
-zope.server = 3.4.3
-zope.session = 3.4.1
-zope.size = 3.4.0
+zope.pagetemplate = 3.5.0
+zope.proxy = 3.5.0
+zope.ptresource = 3.9.0
+zope.publisher = 3.9.3
+zope.ramcache = 1.0
+zope.rdb = 3.5.0
+zope.schema = 3.5.4
+zope.security = 3.7.1
+zope.securitypolicy = 3.6.1
+zope.sendmail = 3.5.1
+zope.sequencesort = 3.4.0
+zope.server = 3.6.1
+zope.session = 3.9.1
+zope.site = 3.7.0
+zope.size = 3.4.1
zope.structuredtext = 3.4.0
-zope.tal = 3.4.1
+zope.tal = 3.5.1
zope.tales = 3.4.0
-zope.testbrowser = 3.4.2
-zope.testing = 3.7.6
+zope.testbrowser = 3.7.0a1
+zope.testing = 3.8.3
+zope.traversing = 3.8.0
+zope.viewlet = 3.6.1
+zope.xmlpickle = 3.4.0
+
+# Dependencies:
+
+ClientForm = 0.2.10
+docutils = 0.5
+infrae.subversion = 1.4.5
+Jinja2 = 2.1.1
+lxml = 2.2.2
+mechanize = 0.1.11
+py = 1.0.0
+Pygments = 1.1
+python-dateutil = 1.4.1
+python-gettext = 1.0
+pytz = 2009l
+RestrictedPython = 3.5.1
+roman = 1.4.0
+setuptools = 0.6c11
+Sphinx = 0.6.3
+transaction = 1.0.0
+z3c.recipe.sphinxdoc = 0.0.8
+zc.buildout = 1.4.1
+zc.lockfile = 1.0.0
+ZConfig = 2.7.1
+zc.recipe.egg = 1.2.2
+zc.recipe.testrunner = 1.2.0
+zc.resourcelibrary = 1.3.0
+zc.sourcefactory = 0.6.0
+zdaemon = 2.0.4
+ZODB3 = 3.9.3
+zodbcode = 3.4.0
+zope.app.container = 3.8.0
+zope.app.folder = 3.5.1
+zope.app.interface = 3.5.0
+zope.app.intid = 3.7.0
+zope.app.keyreference = 3.6.0
+zope.app.localpermission = 3.7.0
+zope.app.skins = 3.4.0
+zope.authentication = 3.7.0
+zope.broken = 3.5.0
+zope.browser = 1.2
+zope.componentvocabulary = 1.0
+zope.kgs = 1.2.0
+zope.password = 3.5.1
+zope.principalannotation = 3.6.0
+zope.principalregistry = 3.7.0
+zope.processlifetime = 1.0
zope.thread = 3.4
-zope.traversing = 3.4.1
-zope.viewlet = 3.4.2
More information about the checkins
mailing list