diff options
| -rw-r--r-- | django/utils/functional.py | 6 | ||||
| -rw-r--r-- | tests/regressiontests/utils/functional.py | 10 | ||||
| -rw-r--r-- | tests/regressiontests/utils/tests.py | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/django/utils/functional.py b/django/utils/functional.py index 2d11ac9cf5..35c994538e 100644 --- a/django/utils/functional.py +++ b/django/utils/functional.py @@ -167,9 +167,13 @@ def lazy(func, *resultclasses): 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, cls.__promise__(resultclass, k, v)) + 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." diff --git a/tests/regressiontests/utils/functional.py b/tests/regressiontests/utils/functional.py new file mode 100644 index 0000000000..72610154d8 --- /dev/null +++ b/tests/regressiontests/utils/functional.py @@ -0,0 +1,10 @@ +from unittest import TestCase + +from django.utils.functional import lazy + + +class FunctionalTestCase(TestCase): + def test_lazy(self): + t = lazy(lambda: tuple(range(3)), list, tuple) + for a, b in zip(t(), range(3)): + self.assertEqual(a, b) diff --git a/tests/regressiontests/utils/tests.py b/tests/regressiontests/utils/tests.py index 6258b81200..d51fa13fd8 100644 --- a/tests/regressiontests/utils/tests.py +++ b/tests/regressiontests/utils/tests.py @@ -12,6 +12,7 @@ import datastructures import dateformat import itercompat from decorators import DecoratorFromMiddlewareTests +from functional import FunctionalTestCase # We need this because "datastructures" uses sorted() and the tests are run in # the scope of this module. |