summaryrefslogtreecommitdiff
path: root/django/utils/encoding.py
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2014-12-06 13:00:09 -0800
committerTim Graham <timograham@gmail.com>2014-12-08 07:58:23 -0500
commit4468c08d70b5b722f3ebd4872909e56580ec7d68 (patch)
tree3da12d757bc9b586df4ba39da20b8793abcae76e /django/utils/encoding.py
parentb327a614eb7d885441c6a2575e10b70ac1352aae (diff)
Fixed #23968 -- Replaced list comprehension with generators and dict comprehension
Diffstat (limited to 'django/utils/encoding.py')
-rw-r--r--django/utils/encoding.py8
1 files changed, 4 insertions, 4 deletions
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)