From 2f73b527dda6683868fac2791f7f07ccb01ea0d9 Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Fri, 25 Jul 2014 19:20:00 +0200 Subject: Fixed #23098 -- Checked that lazy choices are not evaluated too soon Thanks Matthieu Agopian for the report. --- tests/model_fields/tests.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tests/model_fields') diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py index b33314bfd3..87236c31d5 100644 --- a/tests/model_fields/tests.py +++ b/tests/model_fields/tests.py @@ -416,6 +416,13 @@ class ValidationTest(test.TestCase): f = models.CharField(choices=[('', '<><>'), ('a', 'A')]) self.assertEqual(f.get_choices(True), [('', '<><>'), ('a', 'A')]) + def test_charfield_get_choices_doesnt_evaluate_lazy_strings(self): + # Regression test for #23098 + # Will raise ZeroDivisionError if lazy is evaluated + lazy_func = lazy(lambda x: 0/0, int) + f = models.CharField(choices=[(lazy_func('group'), (('a', 'A'), ('b', 'B')))]) + self.assertEqual(f.get_choices(True)[0], ('', '---------')) + def test_choices_validation_supports_named_groups(self): f = models.IntegerField( choices=(('group', ((10, 'A'), (20, 'B'))), (30, 'C'))) -- cgit v1.3