[Zope-Checkins] SVN: Zope/trunk/alltests.cfg Restore python-gettext dependency.
Log message for revision 100355: Restore python-gettext dependency. Changed: U Zope/trunk/alltests.cfg -=- Modified: Zope/trunk/alltests.cfg === --- Zope/trunk/alltests.cfg 2009-05-25 07:19:10 UTC (rev 100354) +++ Zope/trunk/alltests.cfg 2009-05-25 09:33:35 UTC (rev 100355) @@ -79,6 +79,7 @@ zope.app.securitypolicy zope.app.zptpage zope.app.zcmlfiles +python-gettext defaults = ['--module', '!^(zope[.]app)[.]'] ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/doc/CHANGES.rst Note changes merged from tseaver-zope.app_delenda_est branch.
Log message for revision 100358: Note changes merged from tseaver-zope.app_delenda_est branch. Changed: U Zope/trunk/doc/CHANGES.rst -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2009-05-25 15:03:12 UTC (rev 100357) +++ Zope/trunk/doc/CHANGES.rst 2009-05-25 15:20:36 UTC (rev 100358) @@ -8,6 +8,18 @@ Trunk (unreleased) -- +Restructuring ++ + +- Use ``IBrowserView`` interface from ``zope.browser.interfaces``, rather than + ``zope.publisher.interfaces.browser``. + +- Use ``IAdding`` interface from ``zope.browser.interfaces``, rather than + ``zope.app.container``. + +- No longer depend on ``zope.app.appsetup``; use the event implementations + from ``zope.processlifetime`` instead. + Features Added ++ ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ZOPE_APP_DEPENDENCIES.rst Note progress on zope.app dependencies.
Log message for revision 100359: Note progress on zope.app dependencies. Changed: A Zope/trunk/ZOPE_APP_DEPENDENCIES.rst -=- Added: Zope/trunk/ZOPE_APP_DEPENDENCIES.rst === --- Zope/trunk/ZOPE_APP_DEPENDENCIES.rst(rev 0) +++ Zope/trunk/ZOPE_APP_DEPENDENCIES.rst2009-05-25 16:03:51 UTC (rev 100359) @@ -0,0 +1,87 @@ +Zope2 Dependencies on ``zope.app`` Packages +=== + +Zope2 depends on the following zope.app packages directly: + +- [X] zope.app.appsetup + * Zope2.Startup + * Zope.App.Startup + +- [X] zope.app.component + * Products.Five (meta.zcml) + +- [X] zope.app.container + * Products.Five.browser.adding (only indirect now) + * Products.Five.browser.metaconfigure + * Products/Five/browser/doc/products/ViewsTutorial/configure.zcml + +- [_] zope.app.form + o Products.Five.form.* + +- [_] zope.app.pagetemplate + o Products.PageTemplates.Expressions + o Products.Five.browser.pagetemplatefile + o Products.Five.browser.metaconfigure + +- [_] zope.app.publication + o ZPublisher.BaseRequest + o Products.Five.component + +- [_] zope.app.publisher + o ZPublisher.BaseRequest + o Products.Five.browser.adding (for ``getMenu``) + o Products/Five/browser/configure.zcml (for ``IMenuItemType``, +``MenuAccessView``, and ``IMenuAccessView``) + o Products.Five.viewlet.metaconfigure (for ``viewmeta``) + o Products.Five.form.metaconfigure (for ``menuItemDirective``) + o Products.Five.fivedirectives (for ``IBasicResourceInformation``) + +- [_] zope.app.schema + o Products.Five + + +Zope2 has transitive dependencies on these packages: + +- [_] zope.app.applicationcontrol + o zope.traversing + o zope.app.publication + +- [_] zope.app.basicskin + o zope.app.form + +- [_] zope.app.debug + o zope.app.testing + +- [_] zope.app.dependable + o zope.container + o zope.app.testing + +- [_] zope.app.exception + o zope.app.publication + +- [_] zope.app.http + o zope.app.publication + +- [_] zope.app.interface + o zope.app.component + +- [_] zope.app.localpermission + o zope.app.security + +- [_] zope.app.security + o zope.viewlet + o zope.traversing + o zope.testbrowser + o zope.app.* + +- [_] zope.app.testing + o zope.viewlet + o zope.container + o zope.copypastemve + o zope.error + o zope.dublincore + o zope.formlib + o zope.traversing + o zope.testbrowser + o zope.site + o zope.app.* ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/Products/PageTemplates/Expressions.py Use non-extended import style.
Log message for revision 100363: Use non-extended import style. Changed: U Zope/trunk/src/Products/PageTemplates/Expressions.py -=- Modified: Zope/trunk/src/Products/PageTemplates/Expressions.py === --- Zope/trunk/src/Products/PageTemplates/Expressions.py2009-05-25 16:40:17 UTC (rev 100362) +++ Zope/trunk/src/Products/PageTemplates/Expressions.py2009-05-25 16:42:39 UTC (rev 100363) @@ -32,7 +32,7 @@ from zope.traversing.interfaces import ITraversable from zope.traversing.adapters import traversePathElement from zope.proxy import removeAllProxies -import zope.app.pagetemplate.engine +from zope.app.pagetemplate.engine import ZopeEngine import OFS.interfaces from MultiMapping import MultiMapping @@ -254,7 +254,7 @@ __allow_access_to_unprotected_subobjects__ = True -class ZopeEngine(zope.app.pagetemplate.engine.ZopeEngine): +class ZopeEngine(ZopeEngine): _create_context = ZopeContext ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/Products/PageTemplates/Expressions.py Avoid punning the name 'ZopeEngine'.
Log message for revision 100364: Avoid punning the name 'ZopeEngine'. Changed: U Zope/trunk/src/Products/PageTemplates/Expressions.py -=- Modified: Zope/trunk/src/Products/PageTemplates/Expressions.py === --- Zope/trunk/src/Products/PageTemplates/Expressions.py2009-05-25 16:42:39 UTC (rev 100363) +++ Zope/trunk/src/Products/PageTemplates/Expressions.py2009-05-25 16:51:03 UTC (rev 100364) @@ -32,7 +32,7 @@ from zope.traversing.interfaces import ITraversable from zope.traversing.adapters import traversePathElement from zope.proxy import removeAllProxies -from zope.app.pagetemplate.engine import ZopeEngine +from zope.app.pagetemplate.engine import ZopeEngine as Z3Engine import OFS.interfaces from MultiMapping import MultiMapping @@ -254,7 +254,7 @@ __allow_access_to_unprotected_subobjects__ = True -class ZopeEngine(ZopeEngine): +class ZopeEngine(Z3Engine): _create_context = ZopeContext ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ Use ``zope.pagetemplate.engine`` instead of ``zope.app.pagetemplate.engine``.
Log message for revision 100381: Use ``zope.pagetemplate.engine`` instead of ``zope.app.pagetemplate.engine``. o Uupdate versions for new location: - zope.pagetemplate==3.5.0 - zope.app.pagetemplate==3.7.0 - zope.app.publisher==3.8.1 Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/src/Products/PageTemplates/Expressions.py U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2009-05-25 19:54:55 UTC (rev 100380) +++ Zope/trunk/doc/CHANGES.rst 2009-05-25 20:49:45 UTC (rev 100381) @@ -11,6 +11,10 @@ Restructuring + +- Use ``zope.pagetemplate.engine`` instead of ``zope.app.pagetemplate.engine``. + (update to versions 3.5.0 and 3.7.0, respectively, along with version 3.8.1 + of ``zope.app.publisher``). + - Use ``IBrowserView`` interface from ``zope.browser.interfaces``, rather than ``zope.publisher.interfaces.browser``. Modified: Zope/trunk/src/Products/PageTemplates/Expressions.py === --- Zope/trunk/src/Products/PageTemplates/Expressions.py2009-05-25 19:54:55 UTC (rev 100380) +++ Zope/trunk/src/Products/PageTemplates/Expressions.py2009-05-25 20:49:45 UTC (rev 100381) @@ -23,21 +23,25 @@ from zope.component import queryUtility from zope.i18n import translate from zope.interface import implements +from zope.pagetemplate.engine import ZopeEngine as Z3Engine +from zope.proxy import removeAllProxies +from zope.tales.expressions import DeferExpr +from zope.tales.expressions import NotExpr +from zope.tales.expressions import PathExpr +from zope.tales.expressions import StringExpr +from zope.tales.expressions import Undefs +from zope.tales.pythonexpr import PythonExpr from zope.tales.tales import Context from zope.tales.tales import ErrorInfo as BaseErrorInfo from zope.tales.tales import Iterator -from zope.tales.expressions import PathExpr, StringExpr, NotExpr -from zope.tales.expressions import DeferExpr, Undefs -from zope.tales.pythonexpr import PythonExpr from zope.traversing.interfaces import ITraversable from zope.traversing.adapters import traversePathElement -from zope.proxy import removeAllProxies -from zope.app.pagetemplate.engine import ZopeEngine as Z3Engine import OFS.interfaces from MultiMapping import MultiMapping from Acquisition import aq_base -from zExceptions import NotFound, Unauthorized +from zExceptions import NotFound +from zExceptions import Unauthorized from zope.contentprovider.tales import TALESProviderExpression from Products.PageTemplates import ZRPythonExpr Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2009-05-25 19:54:55 UTC (rev 100380) +++ Zope/trunk/versions.cfg 2009-05-25 20:49:45 UTC (rev 100381) @@ -54,10 +54,10 @@ zope.app.intid = 3.7.0 zope.app.locales = 3.5.1 zope.app.localpermission = 3.7.0 -zope.app.pagetemplate = 3.6.0 +zope.app.pagetemplate = 3.7.0 zope.app.principalannotation = 3.6.1 zope.app.publication = 3.7.0 -zope.app.publisher = 3.8.0 +zope.app.publisher = 3.8.1 zope.app.renderer = 3.5.0 zope.app.schema = 3.5.0 zope.app.security = 3.7.0 @@ -108,7 +108,7 @@ zope.location = 3.5.4 zope.minmax = 1.1.0 zope.password = 3.5.1 -zope.pagetemplate = 3.4.2 +zope.pagetemplate = 3.5.0 zope.principalannotation = 3.6.0 zope.principalregistry = 3.7.0 zope.processlifetime = 1.0 ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ Remove all use of ``zope.app.pagetemplate`` by cloning / simplifying code.
Log message for revision 100383: Remove all use of ``zope.app.pagetemplate`` by cloning / simplifying code. o Added tests for previously-untested clients. Changed: U Zope/trunk/ZOPE_APP_DEPENDENCIES.rst U Zope/trunk/doc/CHANGES.rst U Zope/trunk/src/Products/Five/browser/metaconfigure.py U Zope/trunk/src/Products/Five/browser/pagetemplatefile.py U Zope/trunk/src/Products/Five/browser/tests/aqlegacy_ftest.txt A Zope/trunk/src/Products/Five/browser/tests/test_metaconfigure.py A Zope/trunk/src/Products/Five/browser/tests/test_pagetemplatefile.py -=- Modified: Zope/trunk/ZOPE_APP_DEPENDENCIES.rst === --- Zope/trunk/ZOPE_APP_DEPENDENCIES.rst2009-05-26 00:06:45 UTC (rev 100382) +++ Zope/trunk/ZOPE_APP_DEPENDENCIES.rst2009-05-26 01:32:41 UTC (rev 100383) @@ -18,10 +18,10 @@ - [_] zope.app.form o Products.Five.form.* -- [_] zope.app.pagetemplate - o Products.PageTemplates.Expressions - o Products.Five.browser.pagetemplatefile - o Products.Five.browser.metaconfigure +- [X] zope.app.pagetemplate + * Products.PageTemplates.Expressions + * Products.Five.browser.pagetemplatefile + * Products.Five.browser.metaconfigure - [_] zope.app.publication o ZPublisher.BaseRequest Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2009-05-26 00:06:45 UTC (rev 100382) +++ Zope/trunk/doc/CHANGES.rst 2009-05-26 01:32:41 UTC (rev 100383) @@ -11,6 +11,9 @@ Restructuring + +- Removed all use of ``zope.app.pagetemplate`` by cloning / simplifying + client code. + - Use ``zope.pagetemplate.engine`` instead of ``zope.app.pagetemplate.engine``. (update to versions 3.5.0 and 3.7.0, respectively, along with version 3.8.1 of ``zope.app.publisher``). Modified: Zope/trunk/src/Products/Five/browser/metaconfigure.py === --- Zope/trunk/src/Products/Five/browser/metaconfigure.py 2009-05-26 00:06:45 UTC (rev 100382) +++ Zope/trunk/src/Products/Five/browser/metaconfigure.py 2009-05-26 01:32:41 UTC (rev 100383) @@ -22,15 +22,17 @@ from inspect import ismethod from zope import component +from zope.interface import implements from zope.interface import Interface from zope.component.zcml import handler from zope.component.interface import provideInterface from zope.configuration.exceptions import ConfigurationError +from zope.publisher.interfaces import NotFound +from zope.publisher.interfaces.browser import IDefaultBrowserLayer +from zope.publisher.interfaces.browser import IBrowserPublisher from zope.publisher.interfaces.browser import IBrowserRequest -from zope.publisher.interfaces.browser import IDefaultBrowserLayer import zope.app.publisher.browser.viewmeta -import zope.app.pagetemplate.simpleviewclass from zope.app.publisher.browser.viewmeta import providesCallable from zope.app.publisher.browser.viewmeta import _handle_menu from zope.app.publisher.browser.viewmeta import _handle_for @@ -405,10 +407,25 @@ def __call__(self): return getattr(self, self.__page_attribute__) -class ViewMixinForTemplates(BrowserView, -zope.app.pagetemplate.simpleviewclass.simple): -pass +class ViewMixinForTemplates(BrowserView): +# Cloned from zope.app.pagetemplate.simpleviewclass.simple +implements(IBrowserPublisher) +def browserDefault(self, request): +return self, () + +def publishTraverse(self, request, name): +if name == 'index.html': +return self.index + +raise NotFound(self, name, request) + +def __getitem__(self, name): +return self.index.macros[name] + +def __call__(self, *args, **kw): +return self.index(*args, **kw) + def makeClassForTemplate(filename, globals=None, used_for=None, bases=(), cdict=None, name=u''): # XXX needs to deal with security from the bases? Modified: Zope/trunk/src/Products/Five/browser/pagetemplatefile.py === --- Zope/trunk/src/Products/Five/browser/pagetemplatefile.py2009-05-26 00:06:45 UTC (rev 100382) +++ Zope/trunk/src/Products/Five/browser/pagetemplatefile.py2009-05-26 01:32:41 UTC (rev 100383) @@ -16,7 +16,9 @@ $Id$ from os.path import basename -from zope.app.pagetemplate import viewpagetemplatefile +from zope.component import getMultiAdapter +from zope.pagetemplate.pagetemplatefile import PageTemplateFile +from zope.pagetemplate.engine import TrustedAppPT from Acquisition import aq_get from AccessControl import getSecurityManager @@ -29,9 +31,14 @@ def getEngine(): return _engine -class ViewPageTemplateFile(viewpagetemplatefile.ViewPageTemplateFile): +class ViewPageTemplateFile(TrustedAppPT, PageTemplateFile):
[Zope-Checkins] SVN: Zope/trunk/setup.py Note removal of direct dependency on zope.app.pagetemplate.
Log message for revision 100384: Note removal of direct dependency on zope.app.pagetemplate. Changed: U Zope/trunk/setup.py -=- Modified: Zope/trunk/setup.py === --- Zope/trunk/setup.py 2009-05-26 01:32:41 UTC (rev 100383) +++ Zope/trunk/setup.py 2009-05-26 01:36:57 UTC (rev 100384) @@ -146,7 +146,6 @@ 'zope.traversing', 'zope.viewlet', 'zope.app.form', - 'zope.app.pagetemplate', 'zope.app.publication', 'zope.app.publisher', 'zope.app.schema', ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
