Fixed #24836 -- Made force_text() resolve lazy objects.

1 files changed, 2 insertions, 2 deletions

diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 99c9da843a..4e347bdc5f 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -77,12 +77,12 @@ def force_text(s, encoding='utf-8', strings_only=False, errors='strict'):
     If strings_only is True, don't convert (some) non-string-like objects.
     """
     # Handle the common case first for performance reasons.
-    if isinstance(s, six.text_type):
+    if issubclass(type(s), six.text_type):
         return s
     if strings_only and is_protected_type(s):
         return s
     try:
-        if not isinstance(s, six.string_types):
+        if not issubclass(type(s), six.string_types):
             if six.PY3:
                 if isinstance(s, bytes):
                     s = six.text_type(s, encoding, errors)