Skip to content

Z
Zope
Commit 236ef253 authored by Guido van Rossum's avatar Guido van Rossum
Browse files
Options

Change tal:insert -> tal:content

parent 00228391
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 80 deletions
lib/python/TAL/test/out1.html
View file @ 236ef253
......@@ -6,7 +6,7 @@
<body xmlns:z="http://xml.zope.org/namespaces/tal" z:define="foo python:1">
<h1 z:condition="python:1" z:insert="str:This
<h1 z:condition="python:1" z:content="str:This
Is
The
Replaced
......@@ -17,9 +17,9 @@ Title">This</h1>
<!-- examples adapted from TemplateAttributeLanguageSyntax -->
<span z:insert="str:here/id">here/id</span>
<span z:content="str:here/id">here/id</span>
<p z:define="x str:template/title; global five python:2+3;" z:insert="text var:five">5</p>
<p z:define="x str:template/title; global five python:2+3;" z:content="text var:five">5</p>
<p z:repeat="car python:['honda', 'subaru', 'acura']">
honda
......@@ -37,13 +37,13 @@ Title">This</h1>
<ul>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">honda</li>
<li z:content="var:car">honda</li>
</span>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">subaru</li>
<li z:content="var:car">subaru</li>
</span>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">acura</li>
<li z:content="var:car">acura</li>
</span>
</ul>
......@@ -53,14 +53,14 @@ Title">This</h1>
<a z:attributes="href python:'http://python.org' " href="http://python.org">python</a>
<!-- test insert/replace structure -->
<span z:insert="structure python:None"></span>
<span z:content="structure python:None"></span>
<span z:define="global x str:&lt;h3&gt;Header Level 3&lt;/h3&gt;"/>
<span z:define="global x python:'&amp;' + 'nbsp;;' + x"/>
&nbsp;<h3>Header Level 3</h3>
<span z:insert="structure x">&nbsp;<h3>Header Level 3</h3></span>
<span z:content="structure x">&nbsp;<h3>Header Level 3</h3></span>
</body>
......
lib/python/TAL/test/out1.xml
View file @ 236ef253
......@@ -8,16 +8,16 @@
<body xmlns:z="http://xml.zope.org/namespaces/tal" z:define="foo python:1">
<h1 z:condition="python:1" z:insert="str:This Is The Replaced Title">This Is The Replaced Title</h1>
<h1 z:condition="python:1" z:content="str:This Is The Replaced Title">This Is The Replaced Title</h1>
<!-- test entity references -->
&nbsp;&HarryPotter;
<!-- examples adapted from TemplateAttributeLanguageSyntax -->
<span z:insert="str:here/id">here/id</span>
<span z:content="str:here/id">here/id</span>
<p z:define="x str:template/title; global five python:2+3;" z:insert="text var:five">5</p>
<p z:define="x str:template/title; global five python:2+3;" z:content="text var:five">5</p>
<p z:repeat="car python:['honda', 'subaru', 'acura']">
honda
......@@ -35,13 +35,13 @@
<ul>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">honda</li>
<li z:content="var:car">honda</li>
</span>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">subaru</li>
<li z:content="var:car">subaru</li>
</span>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">acura</li>
<li z:content="var:car">acura</li>
</span>
</ul>
......@@ -51,14 +51,14 @@
<a z:attributes="href python:'http://python.org' " href="http://python.org">python</a>
<!-- test insert/replace structure -->
<span z:insert="structure python:None"></span>
<span z:content="structure python:None"></span>
<span z:define="global x str:&lt;h3&gt;Header Level 3&lt;/h3&gt;"/>
<span z:define="global x python:'&amp;' + 'nbsp;;' + x"/>
&nbsp;<h3>Header Level 3</h3>
<span z:insert="structure x">&nbsp;<h3>Header Level 3</h3></span>
<span z:content="structure x">&nbsp;<h3>Header Level 3</h3></span>
</body>
......
lib/python/TAL/test/out3.html
View file @ 236ef253
<?xml version="1.0" ?>
<p xmlns:z="http://xml.zope.org/namespaces/tal">
<span z:define="local x str:hello brave new world">
<span z:insert="text local:x">hello brave new world</span>
<span z:content="text local:x">hello brave new world</span>
<span z:define="local x str:goodbye cruel world">
<span z:insert="text local:x">goodbye cruel world</span>
<span z:content="text local:x">goodbye cruel world</span>
</span>
<span z:insert="text local:x">hello brave new world</span>
<span z:content="text local:x">hello brave new world</span>
</span>
</p>
lib/python/TAL/test/out3.xml
View file @ 236ef253
<?xml version="1.0" ?>
<p xmlns:z="http://xml.zope.org/namespaces/tal">
<span z:define="local x str:hello brave new world">
<span z:insert="text local:x">hello brave new world</span>
<span z:content="text local:x">hello brave new world</span>
<span z:define="local x str:goodbye cruel world">
<span z:insert="text local:x">goodbye cruel world</span>
<span z:content="text local:x">goodbye cruel world</span>
</span>
<span z:insert="text local:x">hello brave new world</span>
<span z:content="text local:x">hello brave new world</span>
</span>
</p>
lib/python/TAL/test/test1.html
View file @ 236ef253
......@@ -8,7 +8,7 @@
<body xmlns:z="http://xml.zope.org/namespaces/tal" z:define="foo python:1">
<h1 z:condition="python:0">This title is not displayed</h1>
<h1 z:condition="python:1" z:insert="str:This
<h1 z:condition="python:1" z:content="str:This
Is
The
Replaced
......@@ -19,9 +19,9 @@ Title">Title</h1>
<!-- examples adapted from TemplateAttributeLanguageSyntax -->
<span z:insert="str:here/id"/>
<span z:content="str:here/id"/>
<p z:define="x str:template/title; global five python:2+3;" z:insert="text var:five"/>
<p z:define="x str:template/title; global five python:2+3;" z:content="text var:five"/>
<p z:repeat="car python:['honda', 'subaru', 'acura']">
<span z:replace="var:car"/>
......@@ -33,7 +33,7 @@ Title">Title</h1>
<ul>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">Car Name</li>
<li z:content="var:car">Car Name</li>
</span>
</ul>
......@@ -43,14 +43,14 @@ Title">Title</h1>
<a z:attributes="href python:'http://python.org' ">python</a>
<!-- test insert/replace structure -->
<span z:insert="structure python:None" />
<span z:content="structure python:None" />
<span z:replace="structure python:None" />
<span z:define="global x str:&lt;h3&gt;Header Level 3&lt;/h3&gt;" />
<span z:define="global x python:'&amp;' + 'nbsp;;' + x" />
<span z:replace="structure x" />
<span z:insert="structure x" />
<span z:content="structure x" />
</body>
......
lib/python/TAL/test/test1.xml
View file @ 236ef253
......@@ -8,7 +8,7 @@
<body xmlns:z="http://xml.zope.org/namespaces/tal" z:define="foo python:1">
<h1 z:condition="python:0">This title is not displayed</h1>
<h1 z:condition="python:1" z:insert="str:This
<h1 z:condition="python:1" z:content="str:This
Is
The
Replaced
......@@ -19,9 +19,9 @@ Title">Title</h1>
<!-- examples adapted from TemplateAttributeLanguageSyntax -->
<span z:insert="str:here/id"/>
<span z:content="str:here/id"/>
<p z:define="x str:template/title; global five python:2+3;" z:insert="text var:five"/>
<p z:define="x str:template/title; global five python:2+3;" z:content="text var:five"/>
<p z:repeat="car python:['honda', 'subaru', 'acura']">
<span z:replace="var:car"/>
......@@ -33,7 +33,7 @@ Title">Title</h1>
<ul>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">Car Name</li>
<li z:content="var:car">Car Name</li>
</span>
</ul>
......@@ -43,14 +43,14 @@ Title">Title</h1>
<a z:attributes="href python:'http://python.org' ">python</a>
<!-- test insert/replace structure -->
<span z:insert="structure python:None" />
<span z:content="structure python:None" />
<span z:replace="structure python:None" />
<span z:define="global x str:&lt;h3&gt;Header Level 3&lt;/h3&gt;" />
<span z:define="global x python:'&amp;' + 'nbsp;;' + x" />
<span z:replace="structure x" />
<span z:insert="structure x" />
<span z:content="structure x" />
</body>
......
lib/python/TAL/test/test3.html
View file @ 236ef253
<?xml version="1.0" ?>
<p xmlns:z="http://xml.zope.org/namespaces/tal">
<span z:define="local x str:hello brave new world">
<span z:insert="text local:x">outer variable x, first appearance</span>
<span z:content="text local:x">outer variable x, first appearance</span>
<span z:define="local x str:goodbye cruel world">
<span z:insert="text local:x">inner variable x</span>
<span z:content="text local:x">inner variable x</span>
</span>
<span z:insert="text local:x">outer variable x, second appearance</span>
<span z:content="text local:x">outer variable x, second appearance</span>
</span>
</p>
lib/python/TAL/test/test3.xml
View file @ 236ef253
<?xml version="1.0" ?>
<p xmlns:z="http://xml.zope.org/namespaces/tal">
<span z:define="local x str:hello brave new world">
<span z:insert="text local:x">outer variable x, first appearance</span>
<span z:content="text local:x">outer variable x, first appearance</span>
<span z:define="local x str:goodbye cruel world">
<span z:insert="text local:x">inner variable x</span>
<span z:content="text local:x">inner variable x</span>
</span>
<span z:insert="text local:x">outer variable x, second appearance</span>
<span z:content="text local:x">outer variable x, second appearance</span>
</span>
</p>
lib/python/TAL/tests/out1.html
View file @ 236ef253
......@@ -6,7 +6,7 @@
<body xmlns:z="http://xml.zope.org/namespaces/tal" z:define="foo python:1">
<h1 z:condition="python:1" z:insert="str:This
<h1 z:condition="python:1" z:content="str:This
Is
The
Replaced
......@@ -17,9 +17,9 @@ Title">This</h1>
<!-- examples adapted from TemplateAttributeLanguageSyntax -->
<span z:insert="str:here/id">here/id</span>
<span z:content="str:here/id">here/id</span>
<p z:define="x str:template/title; global five python:2+3;" z:insert="text var:five">5</p>
<p z:define="x str:template/title; global five python:2+3;" z:content="text var:five">5</p>
<p z:repeat="car python:['honda', 'subaru', 'acura']">
honda
......@@ -37,13 +37,13 @@ Title">This</h1>
<ul>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">honda</li>
<li z:content="var:car">honda</li>
</span>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">subaru</li>
<li z:content="var:car">subaru</li>
</span>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">acura</li>
<li z:content="var:car">acura</li>
</span>
</ul>
......@@ -53,14 +53,14 @@ Title">This</h1>
<a z:attributes="href python:'http://python.org' " href="http://python.org">python</a>
<!-- test insert/replace structure -->
<span z:insert="structure python:None"></span>
<span z:content="structure python:None"></span>
<span z:define="global x str:&lt;h3&gt;Header Level 3&lt;/h3&gt;"/>
<span z:define="global x python:'&amp;' + 'nbsp;;' + x"/>
&nbsp;<h3>Header Level 3</h3>
<span z:insert="structure x">&nbsp;<h3>Header Level 3</h3></span>
<span z:content="structure x">&nbsp;<h3>Header Level 3</h3></span>
</body>
......
lib/python/TAL/tests/out1.xml
View file @ 236ef253
......@@ -8,16 +8,16 @@
<body xmlns:z="http://xml.zope.org/namespaces/tal" z:define="foo python:1">
<h1 z:condition="python:1" z:insert="str:This Is The Replaced Title">This Is The Replaced Title</h1>
<h1 z:condition="python:1" z:content="str:This Is The Replaced Title">This Is The Replaced Title</h1>
<!-- test entity references -->
&nbsp;&HarryPotter;
<!-- examples adapted from TemplateAttributeLanguageSyntax -->
<span z:insert="str:here/id">here/id</span>
<span z:content="str:here/id">here/id</span>
<p z:define="x str:template/title; global five python:2+3;" z:insert="text var:five">5</p>
<p z:define="x str:template/title; global five python:2+3;" z:content="text var:five">5</p>
<p z:repeat="car python:['honda', 'subaru', 'acura']">
honda
......@@ -35,13 +35,13 @@
<ul>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">honda</li>
<li z:content="var:car">honda</li>
</span>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">subaru</li>
<li z:content="var:car">subaru</li>
</span>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">acura</li>
<li z:content="var:car">acura</li>
</span>
</ul>
......@@ -51,14 +51,14 @@
<a z:attributes="href python:'http://python.org' " href="http://python.org">python</a>
<!-- test insert/replace structure -->
<span z:insert="structure python:None"></span>
<span z:content="structure python:None"></span>
<span z:define="global x str:&lt;h3&gt;Header Level 3&lt;/h3&gt;"/>
<span z:define="global x python:'&amp;' + 'nbsp;;' + x"/>
&nbsp;<h3>Header Level 3</h3>
<span z:insert="structure x">&nbsp;<h3>Header Level 3</h3></span>
<span z:content="structure x">&nbsp;<h3>Header Level 3</h3></span>
</body>
......
lib/python/TAL/tests/out3.html
View file @ 236ef253
<?xml version="1.0" ?>
<p xmlns:z="http://xml.zope.org/namespaces/tal">
<span z:define="local x str:hello brave new world">
<span z:insert="text local:x">hello brave new world</span>
<span z:content="text local:x">hello brave new world</span>
<span z:define="local x str:goodbye cruel world">
<span z:insert="text local:x">goodbye cruel world</span>
<span z:content="text local:x">goodbye cruel world</span>
</span>
<span z:insert="text local:x">hello brave new world</span>
<span z:content="text local:x">hello brave new world</span>
</span>
</p>
lib/python/TAL/tests/out3.xml
View file @ 236ef253
<?xml version="1.0" ?>
<p xmlns:z="http://xml.zope.org/namespaces/tal">
<span z:define="local x str:hello brave new world">
<span z:insert="text local:x">hello brave new world</span>
<span z:content="text local:x">hello brave new world</span>
<span z:define="local x str:goodbye cruel world">
<span z:insert="text local:x">goodbye cruel world</span>
<span z:content="text local:x">goodbye cruel world</span>
</span>
<span z:insert="text local:x">hello brave new world</span>
<span z:content="text local:x">hello brave new world</span>
</span>
</p>
lib/python/TAL/tests/test1.html
View file @ 236ef253
......@@ -8,7 +8,7 @@
<body xmlns:z="http://xml.zope.org/namespaces/tal" z:define="foo python:1">
<h1 z:condition="python:0">This title is not displayed</h1>
<h1 z:condition="python:1" z:insert="str:This
<h1 z:condition="python:1" z:content="str:This
Is
The
Replaced
......@@ -19,9 +19,9 @@ Title">Title</h1>
<!-- examples adapted from TemplateAttributeLanguageSyntax -->
<span z:insert="str:here/id"/>
<span z:content="str:here/id"/>
<p z:define="x str:template/title; global five python:2+3;" z:insert="text var:five"/>
<p z:define="x str:template/title; global five python:2+3;" z:content="text var:five"/>
<p z:repeat="car python:['honda', 'subaru', 'acura']">
<span z:replace="var:car"/>
......@@ -33,7 +33,7 @@ Title">Title</h1>
<ul>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">Car Name</li>
<li z:content="var:car">Car Name</li>
</span>
</ul>
......@@ -43,14 +43,14 @@ Title">Title</h1>
<a z:attributes="href python:'http://python.org' ">python</a>
<!-- test insert/replace structure -->
<span z:insert="structure python:None" />
<span z:content="structure python:None" />
<span z:replace="structure python:None" />
<span z:define="global x str:&lt;h3&gt;Header Level 3&lt;/h3&gt;" />
<span z:define="global x python:'&amp;' + 'nbsp;;' + x" />
<span z:replace="structure x" />
<span z:insert="structure x" />
<span z:content="structure x" />
</body>
......
lib/python/TAL/tests/test1.xml
View file @ 236ef253
......@@ -8,7 +8,7 @@
<body xmlns:z="http://xml.zope.org/namespaces/tal" z:define="foo python:1">
<h1 z:condition="python:0">This title is not displayed</h1>
<h1 z:condition="python:1" z:insert="str:This
<h1 z:condition="python:1" z:content="str:This
Is
The
Replaced
......@@ -19,9 +19,9 @@ Title">Title</h1>
<!-- examples adapted from TemplateAttributeLanguageSyntax -->
<span z:insert="str:here/id"/>
<span z:content="str:here/id"/>
<p z:define="x str:template/title; global five python:2+3;" z:insert="text var:five"/>
<p z:define="x str:template/title; global five python:2+3;" z:content="text var:five"/>
<p z:repeat="car python:['honda', 'subaru', 'acura']">
<span z:replace="var:car"/>
......@@ -33,7 +33,7 @@ Title">Title</h1>
<ul>
<span z:repeat="car python:['honda', 'subaru', 'acura']">
<li z:insert="var:car">Car Name</li>
<li z:content="var:car">Car Name</li>
</span>
</ul>
......@@ -43,14 +43,14 @@ Title">Title</h1>
<a z:attributes="href python:'http://python.org' ">python</a>
<!-- test insert/replace structure -->
<span z:insert="structure python:None" />
<span z:content="structure python:None" />
<span z:replace="structure python:None" />
<span z:define="global x str:&lt;h3&gt;Header Level 3&lt;/h3&gt;" />
<span z:define="global x python:'&amp;' + 'nbsp;;' + x" />
<span z:replace="structure x" />
<span z:insert="structure x" />
<span z:content="structure x" />
</body>
......
lib/python/TAL/tests/test3.html
View file @ 236ef253
<?xml version="1.0" ?>
<p xmlns:z="http://xml.zope.org/namespaces/tal">
<span z:define="local x str:hello brave new world">
<span z:insert="text local:x">outer variable x, first appearance</span>
<span z:content="text local:x">outer variable x, first appearance</span>
<span z:define="local x str:goodbye cruel world">
<span z:insert="text local:x">inner variable x</span>
<span z:content="text local:x">inner variable x</span>
</span>
<span z:insert="text local:x">outer variable x, second appearance</span>
<span z:content="text local:x">outer variable x, second appearance</span>
</span>
</p>
lib/python/TAL/tests/test3.xml
View file @ 236ef253
<?xml version="1.0" ?>
<p xmlns:z="http://xml.zope.org/namespaces/tal">
<span z:define="local x str:hello brave new world">
<span z:insert="text local:x">outer variable x, first appearance</span>
<span z:content="text local:x">outer variable x, first appearance</span>
<span z:define="local x str:goodbye cruel world">
<span z:insert="text local:x">inner variable x</span>
<span z:content="text local:x">inner variable x</span>
</span>
<span z:insert="text local:x">outer variable x, second appearance</span>
<span z:content="text local:x">outer variable x, second appearance</span>
</span>
</p>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7