[Zope3-checkins] SVN: Zope3/trunk/ make sure we use the released
zpkg for Zope 3 trunk
Fred L. Drake, Jr.
fdrake at gmail.com
Fri Aug 12 16:23:25 EDT 2005
Log message for revision 37898:
make sure we use the released zpkg for Zope 3 trunk
Changed:
_U Zope3/trunk/
U Zope3/trunk/src/zope/app/ftesting.zcml
A Zope3/trunk/src/zope/app/pagetemplate/ftests/
A Zope3/trunk/src/zope/app/pagetemplate/ftests/__init__.py
A Zope3/trunk/src/zope/app/pagetemplate/ftests/configure.zcml
A Zope3/trunk/src/zope/app/pagetemplate/ftests/inner.pt
A Zope3/trunk/src/zope/app/pagetemplate/ftests/intermediate.pt
A Zope3/trunk/src/zope/app/pagetemplate/ftests/outer.pt
A Zope3/trunk/src/zope/app/pagetemplate/ftests/test_nested.py
A Zope3/trunk/src/zope/app/pagetemplate/ftests/test_nested.txt
U Zope3/trunk/utilities/rst2html
-=-
Property changes on: Zope3/trunk
___________________________________________________________________
Name: svn:externals
- zpkgsetup svn://svn.zope.org/repos/main/zpkgtools/trunk/zpkgsetup
+ zpkgsetup svn://svn.zope.org/repos/main/zpkgtools/tags/0.9/zpkgsetup
Modified: Zope3/trunk/src/zope/app/ftesting.zcml
===================================================================
--- Zope3/trunk/src/zope/app/ftesting.zcml 2005-08-12 20:20:19 UTC (rev 37897)
+++ Zope3/trunk/src/zope/app/ftesting.zcml 2005-08-12 20:23:25 UTC (rev 37898)
@@ -5,5 +5,6 @@
>
<include package=".container.browser.ftests" />
+<include package=".pagetemplate.ftests" />
</configure>
Added: Zope3/trunk/src/zope/app/pagetemplate/ftests/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/pagetemplate/ftests/__init__.py 2005-08-12 20:20:19 UTC (rev 37897)
+++ Zope3/trunk/src/zope/app/pagetemplate/ftests/__init__.py 2005-08-12 20:23:25 UTC (rev 37898)
@@ -0,0 +1 @@
+# This directory is a Python package.
Property changes on: Zope3/trunk/src/zope/app/pagetemplate/ftests/__init__.py
___________________________________________________________________
Name: svn:mime-type
+ text/x-python
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/pagetemplate/ftests/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/pagetemplate/ftests/configure.zcml 2005-08-12 20:20:19 UTC (rev 37897)
+++ Zope3/trunk/src/zope/app/pagetemplate/ftests/configure.zcml 2005-08-12 20:23:25 UTC (rev 37898)
@@ -0,0 +1,24 @@
+<configure xmlns="http://namespaces.zope.org/browser">
+
+ <page
+ for="zope.interface.Interface"
+ name="inner"
+ template="inner.pt"
+ permission="zope.Public"
+ />
+
+ <page
+ for="zope.interface.Interface"
+ name="intermediate"
+ template="intermediate.pt"
+ permission="zope.Public"
+ />
+
+ <page
+ for="zope.interface.Interface"
+ name="outer"
+ template="outer.pt"
+ permission="zope.Public"
+ />
+
+</configure>
Property changes on: Zope3/trunk/src/zope/app/pagetemplate/ftests/configure.zcml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/pagetemplate/ftests/inner.pt
===================================================================
--- Zope3/trunk/src/zope/app/pagetemplate/ftests/inner.pt 2005-08-12 20:20:19 UTC (rev 37897)
+++ Zope3/trunk/src/zope/app/pagetemplate/ftests/inner.pt 2005-08-12 20:23:25 UTC (rev 37898)
@@ -0,0 +1,11 @@
+<html metal:use-macro='context/@@intermediate/intermediate'>
+<head>
+<title>Example</title>
+</head>
+<body>
+hello
+<div metal:fill-slot="body">
+inner body slot content
+</div>
+</body>
+</html>
Property changes on: Zope3/trunk/src/zope/app/pagetemplate/ftests/inner.pt
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/pagetemplate/ftests/intermediate.pt
===================================================================
--- Zope3/trunk/src/zope/app/pagetemplate/ftests/intermediate.pt 2005-08-12 20:20:19 UTC (rev 37897)
+++ Zope3/trunk/src/zope/app/pagetemplate/ftests/intermediate.pt 2005-08-12 20:23:25 UTC (rev 37898)
@@ -0,0 +1,15 @@
+<html metal:use-macro='context/@@outer/main'
+ metal:define-macro='intermediate'>
+<head>
+<title>Example</title>
+</head>
+<body>
+hello
+<div metal:fill-slot="body">
+<div metal:define-slot="body">
+body slot
+</div>
+intermediate body slot stuff
+</div>
+</body>
+</html>
Property changes on: Zope3/trunk/src/zope/app/pagetemplate/ftests/intermediate.pt
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/pagetemplate/ftests/outer.pt
===================================================================
--- Zope3/trunk/src/zope/app/pagetemplate/ftests/outer.pt 2005-08-12 20:20:19 UTC (rev 37897)
+++ Zope3/trunk/src/zope/app/pagetemplate/ftests/outer.pt 2005-08-12 20:23:25 UTC (rev 37898)
@@ -0,0 +1,11 @@
+<html metal:define-macro='main'>
+<head>
+<title>Example</title>
+</head>
+<body>
+hello
+<div metal:define-slot="body">
+outer body slot
+</div>
+</body>
+</html>
Property changes on: Zope3/trunk/src/zope/app/pagetemplate/ftests/outer.pt
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/pagetemplate/ftests/test_nested.py
===================================================================
--- Zope3/trunk/src/zope/app/pagetemplate/ftests/test_nested.py 2005-08-12 20:20:19 UTC (rev 37897)
+++ Zope3/trunk/src/zope/app/pagetemplate/ftests/test_nested.py 2005-08-12 20:23:25 UTC (rev 37898)
@@ -0,0 +1,13 @@
+"""Test that nested macro references do the right thing.
+"""
+__docformat__ = "reStructuredText"
+
+import zope.component
+import zope.configuration.xmlconfig
+
+from zope.app.pagetemplate import simpleviewclass
+from zope.app.testing import functional
+
+
+def test_suite():
+ return functional.FunctionalDocFileSuite("test_nested.txt")
Property changes on: Zope3/trunk/src/zope/app/pagetemplate/ftests/test_nested.py
___________________________________________________________________
Name: svn:mime-type
+ text/x-python
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/pagetemplate/ftests/test_nested.txt
===================================================================
--- Zope3/trunk/src/zope/app/pagetemplate/ftests/test_nested.txt 2005-08-12 20:20:19 UTC (rev 37897)
+++ Zope3/trunk/src/zope/app/pagetemplate/ftests/test_nested.txt 2005-08-12 20:23:25 UTC (rev 37898)
@@ -0,0 +1,38 @@
+
+First, we need to create a content object that we can test our sample
+views on::
+
+ >>> print http("""
+ ... POST /@@+/action.html HTTP/1.1
+ ... Authorization: Basic mgr:mgrpw
+ ... """, form={"type_name": "BrowserAdd__zope.app.folder.folder.Folder",
+ ... "id": "folder",
+ ... "add": "Add"})
+ HTTP/1.1 303 ...
+ Location: http://localhost/@@contents.html
+ <BLANKLINE>
+
+Now let's look at our test view to make sure we're seeing the expected
+template expansion::
+
+ >>> print http("""
+ ... GET /folder/@@outer HTTP/1.1
+ ... Authorization: Basic mgr:mgrpw
+ ... """, handle_errors=False)
+ HTTP/1.1 200 ...
+ <BLANKLINE>
+ <html>
+ <head>
+ <title>Example</title>
+ </head>
+ <body>
+ hello
+ <div>
+ <div>
+ inner body slot content
+ </div>
+ intermediate body slot stuff
+ </div>
+ </body>
+ </html>
+ <BLANKLINE>
Property changes on: Zope3/trunk/src/zope/app/pagetemplate/ftests/test_nested.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: Zope3/trunk/utilities/rst2html
===================================================================
--- Zope3/trunk/utilities/rst2html 2005-08-12 20:20:19 UTC (rev 37897)
+++ Zope3/trunk/utilities/rst2html 2005-08-12 20:23:25 UTC (rev 37898)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.3
+#!/usr/bin/env python2.4
import errno
import os
More information about the Zope3-Checkins
mailing list