Skip to content

Z
Zope
Commit 1c171c07 authored by Evan Simpson's avatar Evan Simpson
Browse files
Options

Fix up tests to match TAL, and set mode properly in TALGenerator

parent 41d1b026
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 56 deletions
lib/python/Products/PageTemplates/Expressions.py
View file @ 1c171c07
...@@ -89,11 +89,11 @@ Page Template-specific implementation of TALES, with handlers ...@@ -89,11 +89,11 @@ Page Template-specific implementation of TALES, with handlers
for Python expressions, Python string literals, and paths. for Python expressions, Python string literals, and paths.
""" """
__version__='$Revision: 1.3 $'[11:-2] __version__='$Revision: 1.4 $'[11:-2]
import re, sys import re, sys
from TALES import Engine, CompilerError, _valid_name, NAME_RE from TALES import Engine, CompilerError, _valid_name, NAME_RE
from string import strip, split, join, replace from string import strip, split, join, replace, lstrip
from DocumentTemplate.DT_Util import TemplateDict from DocumentTemplate.DT_Util import TemplateDict
_engine = None _engine = None
...@@ -211,7 +211,7 @@ class StringExpr: ...@@ -211,7 +211,7 @@ class StringExpr:
class NotExpr: class NotExpr:
def __init__(self, name, expr, compiler): def __init__(self, name, expr, compiler):
self._s = expr self._s = expr = lstrip(expr)
self._c = compiler.compile(expr) self._c = compiler.compile(expr)
def __call__(self, econtext): def __call__(self, econtext):
...@@ -268,6 +268,7 @@ else: ...@@ -268,6 +268,7 @@ else:
def validate(self, *args, **kwargs): def validate(self, *args, **kwargs):
return 1 return 1
validateValue = validate validateValue = validate
_marker = []
class PythonExpr: class PythonExpr:
def __init__(self, name, expr): def __init__(self, name, expr):
......
lib/python/Products/PageTemplates/PageTemplate.py
View file @ 1c171c07
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
HTML- and XML-based template objects using TAL, TALES, and METAL. HTML- and XML-based template objects using TAL, TALES, and METAL.
""" """
__version__='$Revision: 1.2 $'[11:-2] __version__='$Revision: 1.3 $'[11:-2]
import os, sys, traceback import os, sys, traceback
from TAL.TALParser import TALParser from TAL.TALParser import TALParser
...@@ -200,10 +200,11 @@ class PageTemplate: ...@@ -200,10 +200,11 @@ class PageTemplate:
A Page Template must always be cooked, and cooking must not A Page Template must always be cooked, and cooking must not
fail due to user input. fail due to user input.
""" """
gen = TALGenerator(getEngine())
if self.html(): if self.html():
gen = TALGenerator(getEngine(), xml=0)
parser = HTMLTALParser(gen) parser = HTMLTALParser(gen)
else: else:
gen = TALGenerator(getEngine())
parser = TALParser(gen) parser = TALParser(gen)
self._v_errors = () self._v_errors = ()
......
lib/python/Products/PageTemplates/tests/input/CheckNotExpression.html
View file @ 1c171c07
<html> <html>
<head></head> <head></head>
<body> <body>
<div tal:content="not:python:0:"></div> <div tal:content="not:python:0"></div>
<div tal:content="not:python:1"></div> <div tal:content="not:python:1"></div>
<div tal:content="not: python:1"></div> <div tal:content="not: python:1"></div>
<div tal:content="not:python:range(1,20)"></div> <div tal:content="not:python:range(1,20)"></div>
......
lib/python/Products/PageTemplates/tests/input/TeeShopLAF.html
View file @ 1c171c07
<html metal:define-macro="page"> <html metal:define-macro="page">
<head> <head>
<title>Zope Stuff</title> <title>Zope Stuff</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" href="/common.css"/> <link rel="stylesheet" href="/common.css">
</head> </head>
<body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"> <body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
<td> <td>
<table width="200" border="0" cellspacing="0" cellpadding="0"> <table width="200" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="#FFFFFF"> <tr bgcolor="#FFFFFF">
<td><img src="/images/lside.gif" width="52" height="94"/><img src="/images/swlogo.gif" width="150" height="89"/><img src="/images/rside.gif" width="52" height="94"/></td> <td><img src="/images/lside.gif" width="52" height="94"><img src="/images/swlogo.gif" width="150" height="89"><img src="/images/rside.gif" width="52" height="94"></td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<br/> <br>
<table width="300" border="0" cellspacing="0" cellpadding="0" align="center"> <table width="300" border="0" cellspacing="0" cellpadding="0" align="center">
<tr align="center"> <tr align="center">
<td width="25%" class="boldbodylist">apparel</td> <td width="25%" class="boldbodylist">apparel</td>
...@@ -26,24 +26,24 @@ ...@@ -26,24 +26,24 @@
<td width="25%" class="boldbodylist">misc</td> <td width="25%" class="boldbodylist">misc</td>
</tr> </tr>
</table> </table>
<br/> <br>
<br/> <br>
<div metal:define-slot="body"> <div metal:define-slot="body">
<table width="500" border="0" cellspacing="0" cellpadding="0" align="center"> <table width="500" border="0" cellspacing="0" cellpadding="0" align="center">
<tr> <tr>
<td bgcolor="#0000CC"> <td bgcolor="#0000CC">
<table width="100%" border="0" cellspacing="1" cellpadding="3"> <table width="100%" border="0" cellspacing="1" cellpadding="3">
<tr bgcolor="#FFFFFF" align="center"> <tr bgcolor="#FFFFFF" align="center">
<td><img src="/images/welcome.gif" width="293" height="28"/></td> <td><img src="/images/welcome.gif" width="293" height="28"></td>
</tr> </tr>
<tr bgcolor="#FFFFFF" align="center" valign="top"> <tr bgcolor="#FFFFFF" align="center" valign="top">
<td> <br/> <td> <br>
<table width="100%" border="0" cellspacing="0" cellpadding="6"> <table width="100%" border="0" cellspacing="0" cellpadding="6">
<tr> <tr>
<td>This is the tee for those who LOVE Zope. Show your heart on <td>This is the tee for those who LOVE Zope. Show your heart on
your tee.</td> your tee.</td>
<td align="right" width="1%"> <td align="right" width="1%">
<p><img src="/images/smlatee.jpg" width="200" height="200"/></p> <p><img src="/images/smlatee.jpg" width="200" height="200"></p>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -54,19 +54,19 @@ ...@@ -54,19 +54,19 @@
</tr> </tr>
</table> </table>
</div> </div>
<br/><br/> <br><br>
<table width="100%" border="0" cellspacing="1" cellpadding="3" align="center"> <table width="100%" border="0" cellspacing="1" cellpadding="3" align="center">
<tr> <tr>
<td align="center" bgcolor="#FFFFFF" class="bodylist"> <td align="center" bgcolor="#FFFFFF" class="bodylist">
Copyright &copy; 2000 Copyright &copy; 2000
<a href="http://www.4-am.com">4AM Productions, Inc.</a>. <a href="http://www.4-am.com">4AM Productions, Inc.</a>.
All rights reserved. <br/> All rights reserved. <br>
Questions or problems should be directed to Questions or problems should be directed to
<a href="mailto:webmaster@teamzonline.com">the webmaster</a>, <a href="mailto:webmaster@teamzonline.com">the webmaster</a>,
254-412-0846.</td> 254-412-0846.</td>
</tr> </tr>
<tr> <tr>
<td align="center"><img src="/images/zopelogos/buildzope.gif" width="54" height="54"/></td> <td align="center"><img src="/images/zopelogos/buildzope.gif" width="54" height="54"></td>
</tr> </tr>
</table> </table>
</body> </body>
......
lib/python/Products/PageTemplates/tests/output/GlobalsShadowLocals.html
View file @ 1c171c07
<html tal:define="global x python:1"> <html tal:define="global x python:1">
<head/> <head></head>
<body> <body>
<div tal:define="x python:2"> <div tal:define="x python:2">
<span tal:content="x">2</span> <span tal:content="x">2</span>
......
lib/python/Products/PageTemplates/tests/output/TeeShop1.html
View file @ 1c171c07
<html metal:use-macro="container/laf/macros/page"> <html metal:use-macro="container/laf/macros/page">
<head> <head>
<title>Zope Stuff</title> <title>Zope Stuff</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" href="/common.css"/> <link rel="stylesheet" href="/common.css">
</head> </head>
<body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"> <body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
<td> <td>
<table width="200" border="0" cellspacing="0" cellpadding="0"> <table width="200" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="#FFFFFF"> <tr bgcolor="#FFFFFF">
<td><img src="/images/lside.gif" width="52" height="94"/><img src="/images/swlogo.gif" width="150" height="89"/><img src="/images/rside.gif" width="52" height="94"/></td> <td><img src="/images/lside.gif" width="52" height="94"><img src="/images/swlogo.gif" width="150" height="89"><img src="/images/rside.gif" width="52" height="94"></td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<br/> <br>
<table width="300" border="0" cellspacing="0" cellpadding="0" align="center"> <table width="300" border="0" cellspacing="0" cellpadding="0" align="center">
<tr align="center"> <tr align="center">
<td width="25%" class="boldbodylist">apparel</td> <td width="25%" class="boldbodylist">apparel</td>
...@@ -26,15 +26,15 @@ ...@@ -26,15 +26,15 @@
<td width="25%" class="boldbodylist">misc</td> <td width="25%" class="boldbodylist">misc</td>
</tr> </tr>
</table> </table>
<br/> <br>
<br/> <br>
<div metal:fill-slot="body"> <div metal:fill-slot="body">
<table width="500" border="0" cellspacing="0" cellpadding="0" align="center"> <table width="500" border="0" cellspacing="0" cellpadding="0" align="center">
<tr> <tr>
<td bgcolor="#0000CC"> <td bgcolor="#0000CC">
<table width="100%" border="0" cellspacing="1" cellpadding="3"> <table width="100%" border="0" cellspacing="1" cellpadding="3">
<tr bgcolor="#FFFFFF" align="center"> <tr bgcolor="#FFFFFF" align="center">
<td><img src="/images/welcome.gif" width="293" height="28"/></td> <td><img src="/images/welcome.gif" width="293" height="28"></td>
</tr> </tr>
<tr bgcolor="#FFFFFF" align="center" valign="top" tal:repeat="product options/getProducts"> <tr bgcolor="#FFFFFF" align="center" valign="top" tal:repeat="product options/getProducts">
<td> <td>
...@@ -45,11 +45,11 @@ ...@@ -45,11 +45,11 @@
<td align="right" width="1%" rowspan="2"> <td align="right" width="1%" rowspan="2">
<p><img src="/images/smlatee.jpg" <p><img src="/images/smlatee.jpg"
width="200" height="200" width="200" height="200"
tal:attributes="src string:/images/${product/image}" /></p> tal:attributes="src string:/images/${product/image}"></p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="bodylist"><img src="images/clear.gif" width="150" height="10"/></td> <td class="bodylist"><img src="images/clear.gif" width="150" height="10"></td>
<td class="bodylist"><b>Price</b>:12.99</td> <td class="bodylist"><b>Price</b>:12.99</td>
</tr> </tr>
</table> </table>
...@@ -64,11 +64,11 @@ ...@@ -64,11 +64,11 @@
<td align="right" width="1%" rowspan="2"> <td align="right" width="1%" rowspan="2">
<p><img src="/images/smpztee.jpg" <p><img src="/images/smpztee.jpg"
width="200" height="200" width="200" height="200"
tal:attributes="src string:/images/${product/image}" /></p> tal:attributes="src string:/images/${product/image}"></p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="bodylist"><img src="images/clear.gif" width="150" height="10"/></td> <td class="bodylist"><img src="images/clear.gif" width="150" height="10"></td>
<td class="bodylist"><b>Price</b>:11.99</td> <td class="bodylist"><b>Price</b>:11.99</td>
</tr> </tr>
</table> </table>
...@@ -78,8 +78,8 @@ ...@@ -78,8 +78,8 @@
<td> <td>
<table width="100%" border="0" cellspacing="0" cellpadding="6"> <table width="100%" border="0" cellspacing="0" cellpadding="6">
<tr> <tr>
<td align="center"><img src="images/buttons/submit.gif" width="87" height="30"/></td> <td align="center"><img src="images/buttons/submit.gif" width="87" height="30"></td>
<td align="center"><img src="images/buttons/cancel.gif" width="87" height="30"/></td> <td align="center"><img src="images/buttons/cancel.gif" width="87" height="30"></td>
</tr> </tr>
</table> </table>
</td> </td>
...@@ -89,19 +89,19 @@ ...@@ -89,19 +89,19 @@
</tr> </tr>
</table> </table>
</div> </div>
<br/><br/> <br><br>
<table width="100%" border="0" cellspacing="1" cellpadding="3" align="center"> <table width="100%" border="0" cellspacing="1" cellpadding="3" align="center">
<tr> <tr>
<td align="center" bgcolor="#FFFFFF" class="bodylist"> <td align="center" bgcolor="#FFFFFF" class="bodylist">
Copyright &copy; 2000 Copyright &copy; 2000
<a href="http://www.4-am.com">4AM Productions, Inc.</a>. <a href="http://www.4-am.com">4AM Productions, Inc.</a>.
All rights reserved. <br/> All rights reserved. <br>
Questions or problems should be directed to Questions or problems should be directed to
<a href="mailto:webmaster@teamzonline.com">the webmaster</a>, <a href="mailto:webmaster@teamzonline.com">the webmaster</a>,
254-412-0846.</td> 254-412-0846.</td>
</tr> </tr>
<tr> <tr>
<td align="center"><img src="/images/zopelogos/buildzope.gif" width="54" height="54"/></td> <td align="center"><img src="/images/zopelogos/buildzope.gif" width="54" height="54"></td>
</tr> </tr>
</table> </table>
</body> </body>
......
lib/python/Products/PageTemplates/tests/output/TeeShop2.html
View file @ 1c171c07
<html metal:use-macro="container/laf/macros/page"> <html metal:use-macro="container/laf/macros/page">
<head> <head>
<title>Zope Stuff</title> <title>Zope Stuff</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" href="/common.css"/> <link rel="stylesheet" href="/common.css">
</head> </head>
<body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"> <body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
<td> <td>
<table width="200" border="0" cellspacing="0" cellpadding="0"> <table width="200" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="#FFFFFF"> <tr bgcolor="#FFFFFF">
<td><img src="/images/lside.gif" width="52" height="94"/><img src="/images/swlogo.gif" width="150" height="89"/><img src="/images/rside.gif" width="52" height="94"/></td> <td><img src="/images/lside.gif" width="52" height="94"><img src="/images/swlogo.gif" width="150" height="89"><img src="/images/rside.gif" width="52" height="94"></td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<br/> <br>
<table width="300" border="0" cellspacing="0" cellpadding="0" align="center"> <table width="300" border="0" cellspacing="0" cellpadding="0" align="center">
<tr align="center"> <tr align="center">
<td width="25%" class="boldbodylist">apparel</td> <td width="25%" class="boldbodylist">apparel</td>
...@@ -26,24 +26,24 @@ ...@@ -26,24 +26,24 @@
<td width="25%" class="boldbodylist">misc</td> <td width="25%" class="boldbodylist">misc</td>
</tr> </tr>
</table> </table>
<br/> <br>
<br/> <br>
<div metal:fill-slot="body"> <div metal:fill-slot="body">
Body Body
</div> </div>
<br/><br/> <br><br>
<table width="100%" border="0" cellspacing="1" cellpadding="3" align="center"> <table width="100%" border="0" cellspacing="1" cellpadding="3" align="center">
<tr> <tr>
<td align="center" bgcolor="#FFFFFF" class="bodylist"> <td align="center" bgcolor="#FFFFFF" class="bodylist">
Copyright &copy; 2000 Copyright &copy; 2000
<a href="http://www.4-am.com">4AM Productions, Inc.</a>. <a href="http://www.4-am.com">4AM Productions, Inc.</a>.
All rights reserved. <br/> All rights reserved. <br>
Questions or problems should be directed to Questions or problems should be directed to
<a href="mailto:webmaster@teamzonline.com">the webmaster</a>, <a href="mailto:webmaster@teamzonline.com">the webmaster</a>,
254-412-0846.</td> 254-412-0846.</td>
</tr> </tr>
<tr> <tr>
<td align="center"><img src="/images/zopelogos/buildzope.gif" width="54" height="54"/></td> <td align="center"><img src="/images/zopelogos/buildzope.gif" width="54" height="54"></td>
</tr> </tr>
</table> </table>
</body> </body>
......
lib/python/Products/PageTemplates/tests/output/TeeShopLAF.html
View file @ 1c171c07
<html metal:define-macro="page"> <html metal:define-macro="page">
<head> <head>
<title>Zope Stuff</title> <title>Zope Stuff</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" href="/common.css"/> <link rel="stylesheet" href="/common.css">
</head> </head>
<body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"> <body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
<td> <td>
<table width="200" border="0" cellspacing="0" cellpadding="0"> <table width="200" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="#FFFFFF"> <tr bgcolor="#FFFFFF">
<td><img src="/images/lside.gif" width="52" height="94"/><img src="/images/swlogo.gif" width="150" height="89"/><img src="/images/rside.gif" width="52" height="94"/></td> <td><img src="/images/lside.gif" width="52" height="94"><img src="/images/swlogo.gif" width="150" height="89"><img src="/images/rside.gif" width="52" height="94"></td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<br/> <br>
<table width="300" border="0" cellspacing="0" cellpadding="0" align="center"> <table width="300" border="0" cellspacing="0" cellpadding="0" align="center">
<tr align="center"> <tr align="center">
<td width="25%" class="boldbodylist">apparel</td> <td width="25%" class="boldbodylist">apparel</td>
...@@ -26,24 +26,24 @@ ...@@ -26,24 +26,24 @@
<td width="25%" class="boldbodylist">misc</td> <td width="25%" class="boldbodylist">misc</td>
</tr> </tr>
</table> </table>
<br/> <br>
<br/> <br>
<div metal:define-slot="body"> <div metal:define-slot="body">
<table width="500" border="0" cellspacing="0" cellpadding="0" align="center"> <table width="500" border="0" cellspacing="0" cellpadding="0" align="center">
<tr> <tr>
<td bgcolor="#0000CC"> <td bgcolor="#0000CC">
<table width="100%" border="0" cellspacing="1" cellpadding="3"> <table width="100%" border="0" cellspacing="1" cellpadding="3">
<tr bgcolor="#FFFFFF" align="center"> <tr bgcolor="#FFFFFF" align="center">
<td><img src="/images/welcome.gif" width="293" height="28"/></td> <td><img src="/images/welcome.gif" width="293" height="28"></td>
</tr> </tr>
<tr bgcolor="#FFFFFF" align="center" valign="top"> <tr bgcolor="#FFFFFF" align="center" valign="top">
<td> <br/> <td> <br>
<table width="100%" border="0" cellspacing="0" cellpadding="6"> <table width="100%" border="0" cellspacing="0" cellpadding="6">
<tr> <tr>
<td>This is the tee for those who LOVE Zope. Show your heart on <td>This is the tee for those who LOVE Zope. Show your heart on
your tee.</td> your tee.</td>
<td align="right" width="1%"> <td align="right" width="1%">
<p><img src="/images/smlatee.jpg" width="200" height="200"/></p> <p><img src="/images/smlatee.jpg" width="200" height="200"></p>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -54,19 +54,19 @@ ...@@ -54,19 +54,19 @@
</tr> </tr>
</table> </table>
</div> </div>
<br/><br/> <br><br>
<table width="100%" border="0" cellspacing="1" cellpadding="3" align="center"> <table width="100%" border="0" cellspacing="1" cellpadding="3" align="center">
<tr> <tr>
<td align="center" bgcolor="#FFFFFF" class="bodylist"> <td align="center" bgcolor="#FFFFFF" class="bodylist">
Copyright &copy; 2000 Copyright &copy; 2000
<a href="http://www.4-am.com">4AM Productions, Inc.</a>. <a href="http://www.4-am.com">4AM Productions, Inc.</a>.
All rights reserved. <br/> All rights reserved. <br>
Questions or problems should be directed to Questions or problems should be directed to
<a href="mailto:webmaster@teamzonline.com">the webmaster</a>, <a href="mailto:webmaster@teamzonline.com">the webmaster</a>,
254-412-0846.</td> 254-412-0846.</td>
</tr> </tr>
<tr> <tr>
<td align="center"><img src="/images/zopelogos/buildzope.gif" width="54" height="54"/></td> <td align="center"><img src="/images/zopelogos/buildzope.gif" width="54" height="54"></td>
</tr> </tr>
</table> </table>
</body> </body>
......
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