Forward port from 2.10 branch:

Log message for revision 71799: Fixed Collector #2223: Evaluation of booleans in TALES and the 'default' variable. That consisted of forwardporting r70918 and r71797 from the 2.9 branch and providing a fix.

Forward port from 2.10 branch:
Log message for revision 71799: Fixed Collector #2223: Evaluation of booleans in TALES and the 'default' variable. That consisted of forwardporting r70918 and r71797 from the 2.9 branch and providing a fix.
396a0f83 · Philipp von Weitershausen · 87bc0b55 · 6118ff0d · 396a0f83 · 396a0f83
Commit 396a0f83 authored Jan 08, 2007 by Philipp von Weitershausen
5 changed files
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -8,6 +8,9 @@ Zope Changes
    Restructuring
+      - Fixed Collector #2223: Evaluation of booleans in TALES and the
+        'default' variable.
      - Removed deprecated support for product initialization based on
        '__ac_permissions__' and 'meta_types' attributes.

--- a/lib/python/Products/PageTemplates/Expressions.py
+++ b/lib/python/Products/PageTemplates/Expressions.py
@@ -182,12 +182,20 @@ class ZopeContext(Context):
            domain, msgid, mapping=mapping,
            context=context, default=default)
+    def evaluateBoolean(self, expr):
+        value = self.evaluate(expr)
+        # here we override the normal Zope 3 behaviour.  Zope 3
+        # doesn't care about the default in a boolean expression,
+        # while we do (Zope 2 legacy, see the
+        # BooleanAttributesAndDefault.html test case)
+        if value is self.getDefault():
+            return value
+        return bool(value)
    def evaluateText(self, expr):
        """ customized version in order to get rid of unicode
            errors for all and ever
        """
        text = self.evaluate(expr)
        if text is self.getDefault() or text is None:

--- a/lib/python/Products/PageTemplates/tests/input/BooleanAttributesAndDefault.html
+++ b/lib/python/Products/PageTemplates/tests/input/BooleanAttributesAndDefault.html
+<html>
+<head></head>
+<body>
+<p tal:attributes="disabled python:True and default or 'disabled'"></p>
+<p tal:attributes="disabled python:False and default or 'disabled'"></p>
+</body>
+</html>
--- a/lib/python/Products/PageTemplates/tests/output/BooleanAttributesAndDefault.html
+++ b/lib/python/Products/PageTemplates/tests/output/BooleanAttributesAndDefault.html
+<html>
+<head></head>
+<body>
+<p></p>
+<p disabled="disabled"></p>
+</body>
+</html>
--- a/lib/python/Products/PageTemplates/tests/testHTMLTests.py
+++ b/lib/python/Products/PageTemplates/tests/testHTMLTests.py
@@ -173,6 +173,12 @@ class HTMLTests(zope.component.testing.PlacelessSetup, unittest.TestCase):
    def checkRepeatVariable(self):
        self.assert_expected(self.folder.t, 'RepeatVariable.html')
+    def checkBooleanAttributesAndDefault(self):
+        # Zope 2.9 and below support the semantics that an HTML
+        # "boolean" attribute (e.g. 'selected', 'disabled', etc.) can
+        # be used together with 'default'.
+        self.assert_expected(self.folder.t, 'BooleanAttributesAndDefault.html')
 def test_suite():
    return unittest.makeSuite(HTMLTests, 'check')