summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/functional.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/utils/functional.py b/django/utils/functional.py
index 9e4df4b2f7..4c085d9c6d 100644
--- a/django/utils/functional.py
+++ b/django/utils/functional.py
@@ -95,6 +95,7 @@ def lazy(func, *resultclasses):
cls.__str__ = cls.__text_cast
else:
cls.__unicode__ = cls.__text_cast
+ cls.__str__ = cls.__bytes_cast_encoded
elif cls._delegate_bytes:
if six.PY3:
cls.__bytes__ = cls.__bytes_cast
@@ -117,6 +118,9 @@ def lazy(func, *resultclasses):
def __bytes_cast(self):
return bytes(func(*self.__args, **self.__kw))
+ def __bytes_cast_encoded(self):
+ return func(*self.__args, **self.__kw).encode('utf-8')
+
def __cast(self):
if self._delegate_bytes:
return self.__bytes_cast()