From a831e4bad0e5f616680955dfd63a38fa49d8086b Mon Sep 17 00:00:00 2001 From: Jonas Haag Date: Thu, 19 Oct 2017 00:09:19 +0200 Subject: [2.0.x] Fixed #28711 -- Fixed unordered_list template filter with lazy translations. Backport of d997ab776477dd9ecb158229b2622c7f1ed93dfb from master --- django/template/defaultfilters.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'django') diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index b172be6239..935fcdff8e 100644 --- a/django/template/defaultfilters.py +++ b/django/template/defaultfilters.py @@ -1,6 +1,7 @@ """Default variable filters.""" import random as random_module import re +import types from decimal import ROUND_HALF_UP, Context, Decimal, InvalidOperation from functools import wraps from operator import itemgetter @@ -616,7 +617,7 @@ def unordered_list(value, autoescape=True): except StopIteration: yield item, None break - if not isinstance(next_item, str): + if isinstance(next_item, (list, tuple, types.GeneratorType)): try: iter(next_item) except TypeError: -- cgit v1.3