summaryrefslogtreecommitdiff
path: root/django/utils/encoding.py
diff options
context:
space:
mode:
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 6bc285d899..66077e2108 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -21,8 +21,7 @@ class DjangoUnicodeDecodeError(UnicodeDecodeError):
def __str__(self):
original = UnicodeDecodeError.__str__(self)
- return '%s. You passed in %r (%s)' % (original, self.obj,
- type(self.obj))
+ return '%s. You passed in %r (%s)' % (original, self.obj, type(self.obj))
# For backwards compatibility. (originally in Django, then added to six 1.9)
@@ -42,8 +41,9 @@ def smart_text(s, encoding='utf-8', strings_only=False, errors='strict'):
return force_text(s, encoding, strings_only, errors)
-_PROTECTED_TYPES = six.integer_types + (type(None), float, Decimal,
- datetime.datetime, datetime.date, datetime.time)
+_PROTECTED_TYPES = six.integer_types + (
+ type(None), float, Decimal, datetime.datetime, datetime.date, datetime.time
+)
def is_protected_type(obj):