From 4468c08d70b5b722f3ebd4872909e56580ec7d68 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sat, 6 Dec 2014 13:00:09 -0800 Subject: Fixed #23968 -- Replaced list comprehension with generators and dict comprehension --- django/utils/encoding.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'django/utils/encoding.py') diff --git a/django/utils/encoding.py b/django/utils/encoding.py index 39d548a9ce..40096741a7 100644 --- a/django/utils/encoding.py +++ b/django/utils/encoding.py @@ -105,8 +105,8 @@ def force_text(s, encoding='utf-8', strings_only=False, errors='strict'): # working unicode method. Try to handle this without raising a # further exception by individually forcing the exception args # to unicode. - s = ' '.join([force_text(arg, encoding, strings_only, - errors) for arg in s]) + s = ' '.join(force_text(arg, encoding, strings_only, errors) + for arg in s) return s @@ -152,8 +152,8 @@ def force_bytes(s, encoding='utf-8', strings_only=False, errors='strict'): # An Exception subclass containing non-ASCII data that doesn't # know how to print itself properly. We shouldn't raise a # further exception. - return b' '.join([force_bytes(arg, encoding, strings_only, - errors) for arg in s]) + return b' '.join(force_bytes(arg, encoding, strings_only, errors) + for arg in s) return six.text_type(s).encode(encoding, errors) else: return s.encode(encoding, errors) -- cgit v1.3