[Checkins] SVN: z3c.pt/trunk/ Corrected Genshi namespace (needs a trailing slash).
Malthe Borch
mborch at gmail.com
Mon Aug 25 04:48:37 EDT 2008
Log message for revision 90182:
Corrected Genshi namespace (needs a trailing slash).
Changed:
U z3c.pt/trunk/CHANGES.txt
U z3c.pt/trunk/src/z3c/pt/config.py
U z3c.pt/trunk/src/z3c/pt/genshi.txt
U z3c.pt/trunk/src/z3c/pt/template.txt
U z3c.pt/trunk/src/z3c/pt/tests/test_edgecases.py
U z3c.pt/trunk/src/z3c/pt/tests/xinclude3.pt
U z3c.pt/trunk/src/z3c/pt/tests/xinclude4.pt
-=-
Modified: z3c.pt/trunk/CHANGES.txt
===================================================================
--- z3c.pt/trunk/CHANGES.txt 2008-08-24 22:59:40 UTC (rev 90181)
+++ z3c.pt/trunk/CHANGES.txt 2008-08-25 08:48:33 UTC (rev 90182)
@@ -4,6 +4,8 @@
Version 1.0dev
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- Corrected Genshi namespace (needs a trailing slash). [malthe]
+
- Language negotiation is left to the page template superclass, so we
don't need to pass in a translation context anymore. [malthe]
Modified: z3c.pt/trunk/src/z3c/pt/config.py
===================================================================
--- z3c.pt/trunk/src/z3c/pt/config.py 2008-08-24 22:59:40 UTC (rev 90181)
+++ z3c.pt/trunk/src/z3c/pt/config.py 2008-08-25 08:48:33 UTC (rev 90182)
@@ -29,7 +29,7 @@
METAL_NS = "http://xml.zope.org/namespaces/metal"
XI_NS = "http://www.w3.org/2001/XInclude"
I18N_NS = "http://xml.zope.org/namespaces/i18n"
-PY_NS = "http://genshi.edgewall.org"
+PY_NS = "http://genshi.edgewall.org/"
NS_MAP = dict(py=PY_NS, tal=TAL_NS, metal=METAL_NS)
# the symbols table below is used internally be the compiler
Modified: z3c.pt/trunk/src/z3c/pt/genshi.txt
===================================================================
--- z3c.pt/trunk/src/z3c/pt/genshi.txt 2008-08-24 22:59:40 UTC (rev 90181)
+++ z3c.pt/trunk/src/z3c/pt/genshi.txt 2008-08-25 08:48:33 UTC (rev 90182)
@@ -7,7 +7,7 @@
>>> print render_genshi("""\
... <div xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <div py:if="False">
... <p>Bar</p>
... </div>
@@ -34,7 +34,7 @@
>>> print render_genshi("""\
... <div xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <div py:choose="">
... <span py:when="0 == 1">0</span>
... <span py:when="1 == 1">1</span>
@@ -79,7 +79,7 @@
>>> print render_genshi("""\
... <ul xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <li py:for="item in range(3)">${item}</li>
... <py:for each="item in range(3, 5)">
... <li>${item}</li>
@@ -97,7 +97,7 @@
>>> print render_genshi("""\
... <div xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <p py:def="greeting(name)" class="greeting">
... Hello, ${name}!
... </p>
@@ -135,7 +135,7 @@
>>> print render_genshi("""\
... <div xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <span py:with="x=2; y=7; z=x+10">${x} ${y} ${z}</span>
... <py:with vars="x=4; y=3; z=x+5">${x} ${y} ${z}</py:with>
... <blockquote py:with="q=quote()">
@@ -155,7 +155,7 @@
>>> print render_genshi("""\
... <ul xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <li class="expand" py:attrs="{'class': 'collapse'}">Bar</li>
... <li class="expand" py:attrs="d">Bar</li>
... </ul>""", d=dict({'class': u'\u1234'}))
@@ -168,7 +168,7 @@
>>> print render_genshi("""\
... <div xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <span py:content="'Hello, world!'" />
... <span py:replace="'Goodbye, world!'" />
... </div>""")
@@ -181,7 +181,7 @@
>>> print render_genshi("""\
... <div xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <span py:strip="True"><b>foo</b></span>
... </div>""")
<div>
@@ -192,7 +192,7 @@
>>> print render_genshi("""\
... <div xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <span py:match="xmlns:greeting">
... Hello, ${select('@name')[0]}!
... </span>
@@ -217,7 +217,7 @@
>>> print render_genshi("""\
... <div xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <span>inter${'pol' + 'ati'}on</span>is ${int('test') | 'convenient'}!
... <span>${'a'}${'b'}${'c'} ${'d'}</span>
... <span py:with="hello='Hello'" class="${hello} World!" />
@@ -238,7 +238,7 @@
>>> print render_genshi("""\
... <div xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <span py:with="y=7; z=x+10">$x $y $z</span>
... </div>""", x=42)
<div>
@@ -330,7 +330,7 @@
>>> print render_genshi("""\
... <script xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org"
+ ... xmlns:py="http://genshi.edgewall.org/"
... type="text/javascript">
... var brands = [
... <py:for each="brand in []">
@@ -350,7 +350,7 @@
... dict(id=3, title="Three")]
>>> print render_genshi("""\
... <div xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <script type="text/javascript">
... var brands = [
... <py:for each="brand in brands">
@@ -381,7 +381,7 @@
>>> print render_genshi("""\
... <div xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <ul py:def="rendermenu(menu)" py:if="menu">
... ${rendermenu([])}
... </ul>
@@ -393,7 +393,7 @@
>>> print render_genshi("""\
... <div xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <ul py:def="rendermenu(menu)">
... <li py:for="entry in menu"
... py:attrs="{'class' : entry['current'] and 'current' or None}">
Modified: z3c.pt/trunk/src/z3c/pt/template.txt
===================================================================
--- z3c.pt/trunk/src/z3c/pt/template.txt 2008-08-24 22:59:40 UTC (rev 90181)
+++ z3c.pt/trunk/src/z3c/pt/template.txt 2008-08-25 08:48:33 UTC (rev 90182)
@@ -120,7 +120,7 @@
>>> print PageTemplate("""\
... <div xmlns="http://www.w3.org/1999/xhtml"
- ... xmlns:py="http://genshi.edgewall.org">
+ ... xmlns:py="http://genshi.edgewall.org/">
... <py:match path="xmlns:greeting">Hello ${select('@name')[0]}!</py:match>
... <greeting name="World" />
... </div>
Modified: z3c.pt/trunk/src/z3c/pt/tests/test_edgecases.py
===================================================================
--- z3c.pt/trunk/src/z3c/pt/tests/test_edgecases.py 2008-08-24 22:59:40 UTC (rev 90181)
+++ z3c.pt/trunk/src/z3c/pt/tests/test_edgecases.py 2008-08-25 08:48:33 UTC (rev 90182)
@@ -72,7 +72,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:py="http://genshi.edgewall.org">
+ xmlns:py="http://genshi.edgewall.org/">
<title>\xc2\xa9</title>
<div id="${foo}" py:attrs="dict(label=foo)"/>
</html>
Modified: z3c.pt/trunk/src/z3c/pt/tests/xinclude3.pt
===================================================================
--- z3c.pt/trunk/src/z3c/pt/tests/xinclude3.pt 2008-08-24 22:59:40 UTC (rev 90181)
+++ z3c.pt/trunk/src/z3c/pt/tests/xinclude3.pt 2008-08-25 08:48:33 UTC (rev 90182)
@@ -1,5 +1,5 @@
<div xmlns="http://www.w3.org/1999/xhtml"
- xmlns:py="http://genshi.edgewall.org"
+ xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="xinclude${4}.pt" />
${greeting('world')}
Modified: z3c.pt/trunk/src/z3c/pt/tests/xinclude4.pt
===================================================================
--- z3c.pt/trunk/src/z3c/pt/tests/xinclude4.pt 2008-08-24 22:59:40 UTC (rev 90181)
+++ z3c.pt/trunk/src/z3c/pt/tests/xinclude4.pt 2008-08-25 08:48:33 UTC (rev 90182)
@@ -1,5 +1,5 @@
<div xmlns="http://www.w3.org/1999/xhtml"
- xmlns:py="http://genshi.edgewall.org"
+ xmlns:py="http://genshi.edgewall.org/"
py:strip="">
<p py:def="greeting(name)" class="greeting">
Hello, ${name}!
More information about the Checkins
mailing list