diff options
| -rw-r--r-- | django/utils/encoding.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py index ed0a97e5eb..32206d74be 100644 --- a/django/utils/encoding.py +++ b/django/utils/encoding.py @@ -62,13 +62,10 @@ def force_text(s, encoding='utf-8', strings_only=False, errors='strict'): if strings_only and is_protected_type(s): return s try: - if not issubclass(type(s), str): - if isinstance(s, bytes): - s = str(s, encoding, errors) - else: - s = str(s) + if isinstance(s, bytes): + s = str(s, encoding, errors) else: - str(s, encoding, errors) + s = str(s) except UnicodeDecodeError as e: if not isinstance(s, Exception): raise DjangoUnicodeDecodeError(s, *e.args) |