Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.1.X] Fixed #12506 - 'lazy' fails when there are multiple expected …

…classes with the same method

  
Thanks to Alex for report and patch

Backport of r12104 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 3de16688a93d64154dea1f5517d3e9e80b97b080 1 parent d4f9bff
@spookylukey spookylukey authored
View
6 django/utils/functional.py
@@ -167,9 +167,13 @@ def __prepare_class__(cls):
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."
View
10 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)
View
1  tests/regressiontests/utils/tests.py
@@ -12,6 +12,7 @@
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.
Please sign in to comment.
Something went wrong with that request. Please try again.