[Checkins] SVN: grok/branches/ulif-grokdocs/ Sync changes from
trunk.
Uli Fouquet
uli at gnufix.de
Thu May 1 04:58:59 EDT 2008
Log message for revision 85964:
Sync changes from trunk.
Changed:
U grok/branches/ulif-grokdocs/CHANGES.txt
U grok/branches/ulif-grokdocs/buildout.cfg
U grok/branches/ulif-grokdocs/doc/upgrade.txt
U grok/branches/ulif-grokdocs/setup.py
U grok/branches/ulif-grokdocs/src/grok/ftests/rest/rest_traverse.py
U grok/branches/ulif-grokdocs/src/grok/rest.py
U grok/branches/ulif-grokdocs/src/grok/tests/view/inline_unassociated.py
U grok/branches/ulif-grokdocs/src/grok/util.py
A grok/branches/ulif-grokdocs/utitilies/
U grok/branches/ulif-grokdocs/versions.cfg
-=-
Modified: grok/branches/ulif-grokdocs/CHANGES.txt
===================================================================
--- grok/branches/ulif-grokdocs/CHANGES.txt 2008-05-01 08:41:17 UTC (rev 85963)
+++ grok/branches/ulif-grokdocs/CHANGES.txt 2008-05-01 08:58:59 UTC (rev 85964)
@@ -7,6 +7,12 @@
Feature changes
---------------
+* Merged the versions from the 3.4 KGS:
+ http://download.zope.org/zope3.4/versions-3.4.0c1.cfg
+
+ We are now using the latest Zope 3 releases for all the Zope
+ For upgrade notes, see doc/upgrade.txt for more information.
+
* Added support for easier testsetup based on z3c.testsetup. This is a
more stable and more powerful implementation of
grok.testing.register_all_tests(). See
Modified: grok/branches/ulif-grokdocs/buildout.cfg
===================================================================
--- grok/branches/ulif-grokdocs/buildout.cfg 2008-05-01 08:41:17 UTC (rev 85963)
+++ grok/branches/ulif-grokdocs/buildout.cfg 2008-05-01 08:58:59 UTC (rev 85964)
@@ -35,7 +35,7 @@
password="grok"
/>
- <!-- Replace the following directive if you don't want
+ <!-- Replace the following directive if you do not want
public access -->
<grant permission="zope.View"
principal="zope.Anybody" />
Modified: grok/branches/ulif-grokdocs/doc/upgrade.txt
===================================================================
--- grok/branches/ulif-grokdocs/doc/upgrade.txt 2008-05-01 08:41:17 UTC (rev 85963)
+++ grok/branches/ulif-grokdocs/doc/upgrade.txt 2008-05-01 08:58:59 UTC (rev 85964)
@@ -7,6 +7,17 @@
features (please see :ref:`changes` below or refer to ``CHANGES.txt``
for those).
+Upgrading to 0.13
+-----------------
+
+- We moved to newer versions of zope packages, using the KGS list for
+ Zope 3.4c1. This means your code can now get some new deprecation
+ warnings for imports that have been moved. Please check your code
+ and fix your imports if you get those warnings.
+
+ If you were using ``zope.publisher.http.applySkin``, you now must
+ use ``grok.util.applySkin``.
+
Upgrading to 0.12
-----------------
Modified: grok/branches/ulif-grokdocs/setup.py
===================================================================
--- grok/branches/ulif-grokdocs/setup.py 2008-05-01 08:41:17 UTC (rev 85963)
+++ grok/branches/ulif-grokdocs/setup.py 2008-05-01 08:58:59 UTC (rev 85964)
@@ -81,5 +81,6 @@
'zc.catalog',
'z3c.flashmessage',
'z3c.testsetup',
+ 'z3c.testsetup',
],
)
Modified: grok/branches/ulif-grokdocs/src/grok/ftests/rest/rest_traverse.py
===================================================================
--- grok/branches/ulif-grokdocs/src/grok/ftests/rest/rest_traverse.py 2008-05-01 08:41:17 UTC (rev 85963)
+++ grok/branches/ulif-grokdocs/src/grok/ftests/rest/rest_traverse.py 2008-05-01 08:58:59 UTC (rev 85964)
@@ -51,7 +51,7 @@
import grok
from zope.interface import Interface
-from zope.publisher.http import applySkin
+from grok.util import applySkin
class IFoo(Interface):
pass
Modified: grok/branches/ulif-grokdocs/src/grok/rest.py
===================================================================
--- grok/branches/ulif-grokdocs/src/grok/rest.py 2008-05-01 08:41:17 UTC (rev 85963)
+++ grok/branches/ulif-grokdocs/src/grok/rest.py 2008-05-01 08:58:59 UTC (rev 85964)
@@ -1,8 +1,10 @@
import grok
from zope import component
+from zope.component.interfaces import ComponentLookupError
-from zope.traversing.namespace import skin
+from zope.traversing.interfaces import TraversalError
+from zope.traversing.namespace import view
from zope.interface import Interface
from zope.interface.interfaces import IInterface
from zope.publisher.interfaces.browser import IBrowserRequest
@@ -12,6 +14,7 @@
import zope.location
from grok.interfaces import IRESTSkinType
+from zope.publisher.browser import applySkin
class RestPublisher(zope.location.Location):
grok.implements(IBrowserPublisher)
@@ -51,9 +54,21 @@
self.request.response.setHeader('Allow', ', '.join(self.allow))
self.request.response.setStatus(405)
return 'Method Not Allowed'
+
+class rest_skin(view):
+ """A rest skin.
-class rest_skin(skin):
- skin_type = IRESTSkinType
+ This used to be supported by zope.traversing but the change was backed out.
+ We need it for our REST support.
+ """
+ def traverse(self, name, ignored):
+ self.request.shiftNameToApplication()
+ try:
+ skin = component.getUtility(IRESTSkinType, name)
+ except ComponentLookupError:
+ raise TraversalError("++rest++%s" % name)
+ applySkin(self.request, skin)
+ return self.context
class DefaultRest(grok.REST):
grok.context(Interface)
Modified: grok/branches/ulif-grokdocs/src/grok/tests/view/inline_unassociated.py
===================================================================
--- grok/branches/ulif-grokdocs/src/grok/tests/view/inline_unassociated.py 2008-05-01 08:41:17 UTC (rev 85963)
+++ grok/branches/ulif-grokdocs/src/grok/tests/view/inline_unassociated.py 2008-05-01 08:58:59 UTC (rev 85964)
@@ -9,9 +9,7 @@
>>> grok.testing.grok(__name__)
From tests.py's showwarning():
- ...UserWarning: Found the following unassociated template(s) when grokking
- 'grok.tests.view.inline_unassociated': club. Define view classes inheriting
- from grok.View to enable the template(s).
+ ...UserWarning: Found the following unassociated template(s) when grokking 'grok.tests.view.inline_unassociated': club. Define view classes inheriting from grok.View to enable the template(s).
>>> warnings.warn = saved_warn
Modified: grok/branches/ulif-grokdocs/src/grok/util.py
===================================================================
--- grok/branches/ulif-grokdocs/src/grok/util.py 2008-05-01 08:41:17 UTC (rev 85963)
+++ grok/branches/ulif-grokdocs/src/grok/util.py 2008-05-01 08:58:59 UTC (rev 85964)
@@ -18,6 +18,7 @@
import zope.location.location
from zope import component
+from zope import interface
from zope.traversing.browser.interfaces import IAbsoluteURL
from zope.traversing.browser.absoluteurl import _safe as SAFE_URL_CHARACTERS
@@ -188,3 +189,14 @@
check_module_component(class_, component,
component_name, component_directive)
return component
+
+def applySkin(request, skin, skin_type):
+ """Change the presentation skin for this request.
+ """
+ # Remove all existing skin declarations (commonly the default skin).
+ ifaces = [iface for iface in interface.directlyProvidedBy(request)
+ if not skin_type.providedBy(iface)]
+ # Add the new skin.
+ ifaces.append(skin)
+ interface.directlyProvides(request, *ifaces)
+
Copied: grok/branches/ulif-grokdocs/utitilies (from rev 85962, grok/trunk/utitilies)
Modified: grok/branches/ulif-grokdocs/versions.cfg
===================================================================
--- grok/branches/ulif-grokdocs/versions.cfg 2008-05-01 08:41:17 UTC (rev 85963)
+++ grok/branches/ulif-grokdocs/versions.cfg 2008-05-01 08:58:59 UTC (rev 85964)
@@ -1,105 +1,104 @@
[versions]
ClientForm = 0.2.7
+Pygments = 0.8.1
+RestrictedPython = 3.4.2
+ZConfig = 2.5.1
+ZODB3 = 3.8
docutils = 0.4
martian = 0.9.3
mechanize = 0.1.7b
-Pygments = 0.9
-pytz = 2007g
-RestrictedPython = 3.4.2
+pytz = 2007k
simplejson = 1.7.1
-ulif.rest = 0.1
z3c.autoinclude = 0.2.2
z3c.flashmessage = 1.0b2
z3c.testsetup = 0.2.1
-zc.catalog = 1.2b
-ZConfig = 2.5
-zdaemon = 2.0.0
-ZODB3 = 3.8.0b2
-zodbcode = 3.4.0b1dev-r75670
-zope.annotation = 3.4.0
-zope.app.apidoc = 3.4.0
+zc.catalog = 1.2
+zdaemon = 2.0.1
+zodbcode = 3.4
+zope.annotation = 3.4
+zope.app.apidoc = 3.4.3
zope.app.applicationcontrol = 3.4.1
zope.app.appsetup = 3.4.1
-zope.app.authentication = 3.4.0a1
-zope.app.basicskin = 3.4.0a1
-zope.app.broken = 3.4.0a1
-zope.app.catalog = 3.4.0a2
-zope.app.component = 3.4.0b3
-zope.app.container = 3.5.0a1
-zope.app.content = 3.4.0a1
-zope.app.debug = 3.4.0a1
-zope.app.dependable = 3.4.0a1
+zope.app.authentication = 3.4.1
+zope.app.basicskin = 3.4
+zope.app.broken = 3.4
+zope.app.catalog = 3.5.1
+zope.app.component = 3.4.1
+zope.app.container = 3.5.3
+zope.app.content = 3.4
+zope.app.debug = 3.4
+zope.app.dependable = 3.4
zope.app.error = 3.5.1
-zope.app.exception = 3.4.0a1
-zope.app.file = 3.4.0a1
-zope.app.folder = 3.4.0a1
-zope.app.form = 3.4.0b2
-zope.app.generations = 3.4.0a1
-zope.app.http = 3.4.0a1
-zope.app.i18n = 3.4.0a1
-zope.app.interface = 3.4.0a1
-zope.app.intid = 3.4.0a2
-zope.app.keyreference = 3.4.0a1
-zope.app.locales = 3.4.0a1
-zope.app.onlinehelp = 3.4.0a1
-zope.app.pagetemplate = 3.4.0
-zope.app.preference = 3.4.0a1
-zope.app.principalannotation = 3.4.0a1
-zope.app.publication = 3.4.2
-zope.app.publisher = 3.5.0a2
-zope.app.renderer = 3.4.0a1
-zope.app.rotterdam = 3.4.0a1
-zope.app.schema = 3.4.0a1
-zope.app.security = 3.4.0a1-1
-zope.app.server = 3.4.0a1-4
-zope.app.session = 3.4.0a1
-zope.app.skins = 3.4.0a1
-zope.app.testing = 3.4.0a1
-zope.app.tree = 3.4.0a1
-zope.app.twisted = 3.4.0a1
-zope.app.wsgi = 3.4.0
-zope.app.zapi = 3.4.0a1
-zope.app.zcmlfiles = 3.4.0a1
-zope.app.zopeappgenerations = 3.4.0a1
-zope.cachedescriptors = 3.4.0
-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.datetime = 3.4.0
-zope.deferredimport = 3.4.0
-zope.deprecation = 3.4.0
+zope.app.exception = 3.4.1
+zope.app.file = 3.4.2
+zope.app.folder = 3.4
+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
+zope.app.intid = 3.4.1
+zope.app.keyreference = 3.4.1
+zope.app.locales = 3.4.1
+zope.app.onlinehelp = 3.4.1
+zope.app.pagetemplate = 3.4
+zope.app.preference = 3.4.1
+zope.app.principalannotation = 3.4
+zope.app.publication = 3.4.3
+zope.app.publisher = 3.4.1
+zope.app.renderer = 3.4
+zope.app.rotterdam = 3.4.1
+zope.app.schema = 3.4
+zope.app.security = 3.4
+zope.app.server = 3.4
+zope.app.session = 3.5.1
+zope.app.skins = 3.4
+zope.app.testing = 3.4.1
+zope.app.tree = 3.4
+zope.app.twisted = 3.4
+zope.app.wsgi = 3.4
+zope.app.zapi = 3.4
+zope.app.zcmlfiles = 3.4.3
+zope.app.zopeappgenerations = 3.4
+zope.cachedescriptors = 3.4
+zope.component = 3.4
+zope.configuration = 3.4
+zope.contentprovider = 3.4
+zope.contenttype = 3.4
+zope.copypastemove = 3.4
+zope.datetime = 3.4
+zope.deferredimport = 3.4
+zope.deprecation = 3.4
zope.dottedname = 3.4.2
-zope.dublincore = 3.4.0
+zope.dublincore = 3.4
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.event = 3.4
+zope.exceptions = 3.4
+zope.filerepresentation = 3.4
+zope.formlib = 3.4
+zope.hookable = 3.4
+zope.i18n = 3.4
zope.i18nmessageid = 3.4.3
zope.index = 3.4.1
-zope.interface = 3.4.0
-zope.lifecycleevent = 3.4.0
-zope.location = 3.4.0b2
-zope.minmax = 1.0
-zope.modulealias = 3.4.0a1
-zope.pagetemplate = 3.4.0a1
-zope.proxy = 3.4.0
-zope.publisher = 3.5.0a1.dev-r78838
-zope.schema = 3.4.0
-zope.security = 3.4.0b5
-zope.securitypolicy = 3.4.0
-zope.server = 3.5.0a2
+zope.interface = 3.4.1
+zope.lifecycleevent = 3.4
+zope.location = 3.4
+zope.minmax = 1.1
+zope.modulealias = 3.4
+zope.pagetemplate = 3.4
+zope.proxy = 3.4
+zope.publisher = 3.4.2
+zope.schema = 3.4
+zope.security = 3.4
+zope.securitypolicy = 3.4
+zope.server = 3.4.1
zope.session = 3.4.1
-zope.size = 3.4.0
-zope.structuredtext = 3.4.0
-zope.tal = 3.4.0b1
-zope.tales = 3.4.0a1
-zope.testbrowser = 3.4.1
+zope.size = 3.4
+zope.structuredtext = 3.4
+zope.tal = 3.4.1
+zope.tales = 3.4
+zope.testbrowser = 3.4.2
zope.testing = 3.5.1
zope.thread = 3.4
-zope.traversing = 3.5.0a1.dev-r78730
-zope.viewlet = 3.4.1
+zope.traversing = 3.4.0
+zope.viewlet = 3.4.2
More information about the Checkins
mailing list