mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
Fixed #25000 -- Fixed cast to string for lazy objects.
Implemented __str__() to return the string-representation of the proxied object, not the proxy itself, if the lazy object didn't have a string-like object in its resultclasses.
This commit is contained in:
committed by
Tim Graham
parent
c45fbd060a
commit
290ff35e6c
@@ -1,5 +1,9 @@
|
||||
# -*- encoding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import unittest
|
||||
|
||||
from django.utils import six
|
||||
from django.utils.functional import cached_property, lazy, lazy_property
|
||||
|
||||
|
||||
@@ -54,6 +58,26 @@ class FunctionalTestCase(unittest.TestCase):
|
||||
self.assertRaises(NotImplementedError, lambda: A().do)
|
||||
self.assertEqual(B().do, 'DO IT')
|
||||
|
||||
def test_lazy_object_to_string(self):
|
||||
|
||||
class Klazz(object):
|
||||
if six.PY3:
|
||||
def __str__(self):
|
||||
return "Î am ā Ǩlâzz."
|
||||
|
||||
def __bytes__(self):
|
||||
return b"\xc3\x8e am \xc4\x81 binary \xc7\xa8l\xc3\xa2zz."
|
||||
else:
|
||||
def __unicode__(self):
|
||||
return "Î am ā Ǩlâzz."
|
||||
|
||||
def __str__(self):
|
||||
return b"\xc3\x8e am \xc4\x81 binary \xc7\xa8l\xc3\xa2zz."
|
||||
|
||||
t = lazy(lambda: Klazz(), Klazz)()
|
||||
self.assertEqual(six.text_type(t), "Î am ā Ǩlâzz.")
|
||||
self.assertEqual(six.binary_type(t), b"\xc3\x8e am \xc4\x81 binary \xc7\xa8l\xc3\xa2zz.")
|
||||
|
||||
def test_cached_property(self):
|
||||
"""
|
||||
Test that cached_property caches its value,
|
||||
|
||||
Reference in New Issue
Block a user