[Zope-Checkins] CVS: Zope/lib/python/Products/PageTemplates/tests/input - StringExpression.html:1.1.114.2

Fri Dec 19 12:26:29 EST 2003

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates/tests/input
In directory cvs.zope.org:/tmp/cvs-serv2789/lib/python/Products/PageTemplates/tests/input

Modified Files:
      Tag: Zope-2_6-branch
	StringExpression.html 
Log Message:


  Backport assorted fixes for running Zope 2.6.x tests under Python 2.3.

  - lib/python/Products/PluginIndexes/DateIndex:

    o Deal with the fact that in Python 2.3, int can return a long
      instead of throwing OverflowError.

  - lib/python/Products/PageTemplates/tests:

    o Fix spurious error in PageTemplates; no longer rely on the str() of
      exception objects since the value of their str() is not part of their
      API, and can vary between Python releases.

  The following now shows 1781 tests passing, albeit with a number of
  PendingDeprecationWarnings::

    $ python2.3 utilities/testrunner.py -a -v


=== Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html 1.1.114.1 => 1.1.114.2 ===

--- Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html:1.1.114.1	Tue Oct  1 11:54:25 2002
+++ Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html	Fri Dec 19 12:25:58 2003
@@ -3,8 +3,12 @@
    <title tal:content="string:Hello World!">This is the title</title>
 </head>
 <body>
-  <tal:block on-error="string:Error:${error/value}" replace="x" />
-  <tal:block on-error="string:Error:${error/value}">
+  <!-- These next two on-error expressions are very fragile; there's
+       not a lot we can do without fairly interesting exception
+       objects and not be subject to variations in the str() of the
+       exception object. -->
+  <tal:block on-error="string:Error:${error/lineno}" replace="x" />
+  <tal:block on-error="string:Error:${error/lineno}">
     <p tal:content="x">p</p>
   </tal:block>
   <div tal:replace="structure string:&lt;hr /&gt;">rule</div>


