From 290ff35e6cc2580861a6fdeaaa3d4aa6d75f9edd Mon Sep 17 00:00:00 2001 From: Marten Kenbeek Date: Sat, 20 Jun 2015 14:00:55 +0200 Subject: 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. --- django/utils/functional.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'django') diff --git a/django/utils/functional.py b/django/utils/functional.py index c0d19093fc..ee0a1953dd 100644 --- a/django/utils/functional.py +++ b/django/utils/functional.py @@ -128,6 +128,11 @@ def lazy(func, *resultclasses): else: return func(*self.__args, **self.__kw) + def __str__(self): + # object defines __str__(), so __prepare_class__() won't overload + # a __str__() method from the proxied class. + return str(self.__cast()) + def __ne__(self, other): if isinstance(other, Promise): other = other.__cast() -- cgit v1.3