Fix #913

zopefoundation · Oct 9, 2020 · d58e3c0 · d58e3c0
1 parent 6e96a9a
commit d58e3c0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,6 +10,9 @@ https://zope.readthedocs.io/en/2.13/CHANGES.html
 4.5.2 (unreleased)
 ------------------
 
+- Fix ``length`` for page template repeat variables
+  (`#913 <https://github.com/zopefoundation/Zope/issues/913>`_)
+
 - Restore the ZMI `Debug Information` control panel page
   (`#898 <https://github.com/zopefoundation/Zope/issues/898>`_)
 

diff --git a/src/Products/PageTemplates/engine.py b/src/Products/PageTemplates/engine.py
@@ -78,10 +78,9 @@ def __call__(self, key, iterable):
         iterable = list(iterable) if iterable is not None else ()
 
         length = len(iterable)
-        iterator = iter(iterable)
 
         # Insert as repeat item
-        ri = self[key] = RepeatItem(None, iterator, _PseudoContext)
+        ri = self[key] = RepeatItem(None, iterable, _PseudoContext)
 
         return ri, length
 

diff --git a/src/Products/PageTemplates/tests/input/RepeatVariable.html b/src/Products/PageTemplates/tests/input/RepeatVariable.html
@@ -13,6 +13,7 @@
         <li tal:content="string:Roman: ${repeat/item/Roman}"/>
         <li tal:content="string:start: ${repeat/item/start}"/>
         <li tal:content="string:end: ${repeat/item/end}"/>
+        <li tal:content="string:length: ${repeat/item/length}"/>
       </tal:block>
     </ol>
   </body>

diff --git a/src/Products/PageTemplates/tests/output/RepeatVariable.html b/src/Products/PageTemplates/tests/output/RepeatVariable.html
@@ -13,6 +13,7 @@
        <li>Roman: I</li>
        <li>start: True</li>
        <li>end: False</li>
+       <li>length: 5</li>
 
        <li>index: 1</li>
        <li>number: 2</li>
@@ -25,6 +26,7 @@
        <li>Roman: II</li>
        <li>start: False</li>
        <li>end: False</li>
+       <li>length: 5</li>
 
        <li>index: 2</li>
        <li>number: 3</li>
@@ -37,6 +39,7 @@
        <li>Roman: III</li>
        <li>start: False</li>
        <li>end: False</li>
+       <li>length: 5</li>
 
        <li>index: 3</li>
        <li>number: 4</li>
@@ -49,6 +52,7 @@
        <li>Roman: IV</li>
        <li>start: False</li>
        <li>end: False</li>
+       <li>length: 5</li>
 
        <li>index: 4</li>
        <li>number: 5</li>
@@ -61,6 +65,7 @@
        <li>Roman: V</li>
        <li>start: False</li>
        <li>end: True</li>
+       <li>length: 5</li>
 
     </ol>
   </body>