Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ Unreleased
- Use modern packaging metadata with ``pyproject.toml`` instead of ``setup.cfg``.
:pr:`1793`
- Use ``flit_core`` instead of ``setuptools`` as build backend.
- Fix ``slice`` filter incorrectly appending ``fill_with`` value when the
iterable length is evenly divisible by the slice count. :issue:`2118`


Version 3.1.6
Expand Down
6 changes: 5 additions & 1 deletion src/jinja2/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,11 @@ def sync_do_slice(
end = offset + (slice_number + 1) * items_per_slice
tmp = seq[start:end]

if fill_with is not None and slice_number >= slices_with_extra:
if (
fill_with is not None
and slices_with_extra
and slice_number >= slices_with_extra
):
tmp.append(fill_with)

yield tmp
Expand Down
10 changes: 10 additions & 0 deletions tests/test_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,16 @@ def test_slice(self, env):
"[[0, 1, 2, 3], [4, 5, 6, 'X'], [7, 8, 9, 'X']]"
)

def test_slice_evenly_divisible(self, env):
"""fill_with should not be appended when items divide evenly."""
tmpl = env.from_string("{{ foo|slice(4, 'X')|list }}")
out = tmpl.render(foo=[1, 2, 3, 4])
assert out == "[[1], [2], [3], [4]]"

tmpl = env.from_string("{{ foo|slice(2, 'X')|list }}")
out = tmpl.render(foo=[1, 2, 3, 4, 5, 6])
assert out == "[[1, 2, 3], [4, 5, 6]]"

def test_escape(self, env):
tmpl = env.from_string("""{{ '<">&'|escape }}""")
out = tmpl.render()
Expand Down
Loading