mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-17 16:05:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #15811 - lazy() doesn't take into account methods defined in parents

Browse source 
Thanks to abki for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16157 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2011-05-05 00:09:51 +00:00
parent 127f1e4190
commit 23b32c7554
2 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
django/utils/functional.py
View file

@ -68,14 +68,15 @@ def lazy(func, *resultclasses):
cls.__dispatch = {}
for resultclass in resultclasses:
cls.__dispatch[resultclass] = {}
for (k, v) in resultclass.__dict__.items():
# All __promise__ return the same wrapper method, but they
# also do setup, inserting the method into the dispatch
# dict.
meth = cls.__promise__(resultclass, k, v)
if hasattr(cls, k):
continue
setattr(cls, k, meth)
for type_ in reversed(resultclass.mro()):
for (k, v) in type_.__dict__.items():
# All __promise__ return the same wrapper method, but they
# also do setup, inserting the method into the dispatch
# dict.
meth = cls.__promise__(resultclass, k, v)
if hasattr(cls, k):
continue
setattr(cls, k, meth)
cls._delegate_str = str in resultclasses
cls._delegate_unicode = unicode in resultclasses
assert not (cls._delegate_str and cls._delegate_unicode), "Cannot call lazy() with both str and unicode return types."