[Checkins] [zopefoundation/zope.app.pagetemplate] 4d703e: Merged from trunk 25974 and 25984:

GitHub noreply at github.com
Tue Mar 12 13:27:20 UTC 2013 

  Branch: refs/heads/monolithic-zope3-ZopeX3-3.0
  Home:   https://github.com/zopefoundation/zope.app.pagetemplate
  Commit: 4d703e09e3a866feeccb3518a6ec95155a012566
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/4d703e09e3a866feeccb3518a6ec95155a012566
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-07-02 (Fri, 02 Jul 2004)

  Changed paths:
    A engine.py
    A tests/test_boundpagetemplate.py
    A viewpagetemplatefile.py

  Log Message:
  -----------
  Merged from trunk 25974 and 25984:

Moved _error_start to module rather than class scope, so as not to
mistakingly thing that it's part of a public or subclassing interface.

Removed the unused _engine_name.

Redefined pt_getEngineContext as a regular method.

Resolved an XXX

Inlined the barely use html method.


Fixed bug publishing bound page templates

When Fred and I added an interface declaration to
zope.pagetemplate.pagetemplate.PageTemplate, we unwittingly broke
BoundPageTemplates. This was due to the fact that BoundPageTemplates
were overagressive about exposing underlying template attributes, 
including interface declarations.  

Changed BoundPageTemplates to only expose needed attributes, macros
amd filename.

Added a test for the view that exposed the error.


  Commit: a5fa1d8a69fe3235a7cb8fd0e2a934e064ee9f76
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/a5fa1d8a69fe3235a7cb8fd0e2a934e064ee9f76
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-07-06 (Tue, 06 Jul 2004)

  Changed paths:
    M engine.py

  Log Message:
  -----------
  Merged from trunk r26049:

Updated adapter API

as described in:

  http://mail.zope.org/pipermail/zope3-dev/2004-July/011537.html

- query/getAdapter now require a name argument and ignore
  whether the object being adapted provides or conforms to the
  interface.

- New functions 'getAdapterInContext' and 'queryAdapterInContext'
  can be used to do content-dependent simple adapation.  They
  will return the object being adapted if it provides the desired
  interface and will return the result of calling __conform__ if the
  object conforms to the interface.

IMPORTANT

  To do simple adaptation, just call the desired interface:

    adapter = iface(ob) or iface(ob, default)


  Commit: d341d576cc1fe24357d1126286c3d478bb62ca86
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/d341d576cc1fe24357d1126286c3d478bb62ca86
  Author: Stephan Richter <stephan.richter at gmail.com>
  Date:   2004-07-08 (Thu, 08 Jul 2004)

  Changed paths:
    A tests/test_engine.py

  Log Message:
  -----------
  Backport of XXX removal.


  Commit: 9403f503cdc85eecc26d911a29ef12c787f1b2ba
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/9403f503cdc85eecc26d911a29ef12c787f1b2ba
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-07-08 (Thu, 08 Jul 2004)

  Changed paths:
    M engine.py

  Log Message:
  -----------
  Merged from trunk:

r26164 | jim | 2004-07-07 12:51:50 -0400 (Wed, 07 Jul 2004) | 4 lines

Deprecated passing a(n ignored) location argument to translate

This resolves an XXX.


  Commit: c0fbab272ec6b656bef4c80a66f7b37d1b8be1cf
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/c0fbab272ec6b656bef4c80a66f7b37d1b8be1cf
  Author: Stephan Richter <stephan.richter at gmail.com>
  Date:   2004-07-09 (Fri, 09 Jul 2004)

  Changed paths:
    A tests/test_viewzpt.py

  Log Message:
  -----------
  Backported my XXX removals.


  Commit: bdfb966d3f1c74ea6f30923f1469019eb56f69b0
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/bdfb966d3f1c74ea6f30923f1469019eb56f69b0
  Author: Garrett Smith <nodelivery at nodelivery.com>
  Date:   2004-07-23 (Fri, 23 Jul 2004)

  Changed paths:
    A talesapi.py

  Log Message:
  -----------
  Merged r26700 and r26701 from trunk.


  Commit: 895f8457c9ca18b22eaf7b6199b5566b687a1ac9
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/895f8457c9ca18b22eaf7b6199b5566b687a1ac9
  Author: Fred Drake <fdrake at acm.org>
  Date:   2004-07-23 (Fri, 23 Jul 2004)

  Changed paths:
    M engine.py
    A metaconfigure.py
    M tests/test_engine.py
    A tests/trusted.py
    M viewpagetemplatefile.py

  Log Message:
  -----------
  Merged from trunk: Support for untrusted page templates.

This merge contains a large number of patches from the Zope 3 trunk.
These changes collectively cause page templates loaded from the file
system to behave as trusted code (similar to what all page templates
did previously, except for a few things), and page templates loaded
from the database to be treated as untrusted code (so security
declarations are honored during traversal and Python code execution).

The following revisions are included in this merge:

26175 - make python: expressions that don't compile raise right exception
26637 - re-factor the base module importer for path:modules/
26639 - explain the untrusted path:modules/
26640 - clean up some boilerplate
26642 - separate the execution engines for zope.app.pagetemplate
26657 - add tests for trusted and untrusted path:modules/... expressions
26679 - separate python expression compilation to allow override
26688 - implemented restricted Python interpreter for TALES expressions
26689 - add dependency on zope.restrictedpython
26704 - implement untrusted traversal for page templates
26719 - add note about page template security changes


  Commit: 2e50165cdef493d7596a305c7e2c0a01affa6b57
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/2e50165cdef493d7596a305c7e2c0a01affa6b57
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-07-27 (Tue, 27 Jul 2004)

  Changed paths:
    M talesapi.py
    A tests/test_zopepythonexpr.py

  Log Message:
  -----------
  Merged from trunk

  r26787 | jim | 2004-07-27 10:00:42 -0400 (Tue, 27 Jul 2004) | 4 lines

Moved forbidden and unauthorized exception definitions to
zope.security.interfaces.


  Commit: 4e6cfa881376541450bf2f0a02753a606529c68f
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/4e6cfa881376541450bf2f0a02753a606529c68f
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-07-28 (Wed, 28 Jul 2004)

  Changed paths:
    M engine.py

  Log Message:
  -----------
  Merged from trunk

  r26819 | jim | 2004-07-28 15:37:35 -0400 (Wed, 28 Jul 2004) | 36 lines


  Refactored untrusted-python support:

  - collecting restricted builtins, restricted compilation, and
    the slightly higher level "interpreter" support in a single
    untrustedpython package.

  - Changed the way restricted builtins are handled so that we create an
    immutable module, rather than a dictionary.  This is to make
    __builtin__ immutable, to prevent evil code from changing it.

  - We now use Fred's restricted compiler rather than the basic Python
    compiler so that we can manipulate code to:

    - Make sure that the results of getattrs are proxied

    - Prevent use of exec, which we don't have code to handle yet.
      (Not sure if we'll bother.)

    - prevent use of raise or try/except, which we don't support yet,
      but will eventually.

    - Make sure that prints go to an interpreter-supplied object, rather
      than sys.stdout.

  - Updated varous clients to reflect new locations and APIs.

  - Had to work around some bugs in the Python compiler modules.
    Mote that global statements aren't handled correctly.

  I did this because the restricted interpreter was to be included in
  the X3.0 release and, even though it's not actually used, I was afraid
  that someone would try to use it.  Now, we've at least made an effort
  to get it right, although a more thorough review is needed.


  Commit: 16683564cbaad5e903effbc51466d57fb28248f7
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/16683564cbaad5e903effbc51466d57fb28248f7
  Author: Philipp von Weitershausen <philipp at weitershausen.de>
  Date:   2004-07-29 (Thu, 29 Jul 2004)

  Changed paths:
    A configure.zcml
    A interfaces.py
    A tests/test_urlquote.py
    A urlquote.py

  Log Message:
  -----------
  Merge theuni's r25886 from trunk:
New path adapter: 'url' for providing inline url quoting capabilities
from page templates.


  Commit: 8594039229b398cdc62c8169588f6fc551f0dcfe
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/8594039229b398cdc62c8169588f6fc551f0dcfe
  Author: Stephan Richter <stephan.richter at gmail.com>
  Date:   2004-08-12 (Thu, 12 Aug 2004)

  Changed paths:
    A tests/sample.py
    A tests/test_directives.py
    A tests/test_simpleviewclass.py
    M tests/test_viewzpt.py
    M tests/test_zopepythonexpr.py
    A tests/testpackage/content.py
    M viewpagetemplatefile.py

  Log Message:
  -----------
  Backported

r26524 | srichter | 2004-07-14 03:45:38 -0400 (Wed, 14 Jul 2004) | 6 lines
r26551 | srichter | 2004-07-15 03:06:37 -0400 (Thu, 15 Jul 2004) | 6 lines
r26522 | pruggera | 2004-07-14 01:42:06 -0400 (Wed, 14 Jul 2004) | 1 line
r26531 | pruggera | 2004-07-14 13:00:15 -0400 (Wed, 14 Jul 2004) | 1 line
r26534 | pruggera | 2004-07-14 15:55:34 -0400 (Wed, 14 Jul 2004) | 1 line
r26540 | pruggera | 2004-07-14 18:14:25 -0400 (Wed, 14 Jul 2004) | 1 line


  Commit: f5abc1137198841302bc6b698874b34ab3d9d61e
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/f5abc1137198841302bc6b698874b34ab3d9d61e
  Author: Stephan Richter <stephan.richter at gmail.com>
  Date:   2004-08-12 (Thu, 12 Aug 2004)

  Changed paths:
    A __init__.py

  Log Message:
  -----------
  Backported

r26567 | srichter | 2004-07-16 02:58:27 -0400 (Fri, 16 Jul 2004) | 2 lines
r26570 | srichter | 2004-07-16 03:54:40 -0400 (Fri, 16 Jul 2004) | 3 lines


  Commit: 0b4dde5f0ceee2488b2128b2a89718cb041311c1
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/0b4dde5f0ceee2488b2128b2a89718cb041311c1
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-08-20 (Fri, 20 Aug 2004)

  Changed paths:
    M engine.py

  Log Message:
  -----------
  Removed unneeded removeAllProxies calls.


  Commit: 923fe2dbf3b21efddc54e740ec4fb8bf5226c890
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/923fe2dbf3b21efddc54e740ec4fb8bf5226c890
  Author: Stephan Richter <stephan.richter at gmail.com>
  Date:   2004-08-24 (Tue, 24 Aug 2004)

  Changed paths:
    M configure.zcml

  Log Message:
  -----------
  Backported revision 27242 & 27243.


  Commit: de5aedaf150a680b2a9514b7396b20738e7495b4
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/de5aedaf150a680b2a9514b7396b20738e7495b4
  Author: Bjorn Tillenius <bjorn.tillenius at gmail.com>
  Date:   2004-08-26 (Thu, 26 Aug 2004)

  Changed paths:
    M tests/test_urlquote.py
    M urlquote.py

  Log Message:
  -----------
  Merged from trunk:

r27274 | BjornT | 2004-08-26 14:09:15 +0200 (Thu, 26 Aug 2004) | 4 lines

Made URLQuote usable when quoting unicode strings for use in Zope3 URLs

Also added missing svn:properties.


  Commit: d854e1c40a7e319c433db033548934fce1b56bd7
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/d854e1c40a7e319c433db033548934fce1b56bd7
  Author: Phil Ruggera <pruggera at san.rr.com>
  Date:   2004-09-02 (Thu, 02 Sep 2004)

  Changed paths:
    M interfaces.py
    M metaconfigure.py
    A simpleviewclass.py
    M talesapi.py
    M urlquote.py

  Log Message:
  -----------
  Update doc strings to ReST


  Commit: c2e1fc24bda6fa71ce82b3c77e76feadcc3617cf
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/c2e1fc24bda6fa71ce82b3c77e76feadcc3617cf
  Author: Jim Fulton <jim at zope.com>
  Date:   2004-09-02 (Thu, 02 Sep 2004)

  Changed paths:
    M configure.zcml

  Log Message:
  -----------
  Merged from trunk revision 27422:
  Fixed http://collector.zope.org/Zope3-dev/269


  Commit: d2a8ea4f8cc8aeac9c279fa40b2055740843024b
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/d2a8ea4f8cc8aeac9c279fa40b2055740843024b
  Author: Fred Drake <fdrake at acm.org>
  Date:   2004-09-29 (Wed, 29 Sep 2004)

  Changed paths:
    M tests/test_viewzpt.py
    M viewpagetemplatefile.py

  Log Message:
  -----------
  make sure ViewPageTemplateFile sets the Content-Type header if not
already set

(merged from Zope 3 trunk revision 27706)


  Commit: 3e968f51ca3e9dea52619be989e4fa3b27705e18
      https://github.com/zopefoundation/zope.app.pagetemplate/commit/3e968f51ca3e9dea52619be989e4fa3b27705e18
  Author: Fred Drake <fdrake at acm.org>
  Date:   2004-09-30 (Thu, 30 Sep 2004)

  Changed paths:
    A tests/test_binding.py
    M tests/test_simpleviewclass.py

  Log Message:
  -----------
  fix some tests that tried to skimp by not creating a request object
(not needed on the trunk, since the tests there had already been fixed)


Compare: https://github.com/zopefoundation/zope.app.pagetemplate/compare/4d703e09e3a8^...3e968f51ca3e

More information about the checkins mailing list