Author: Alex
Date: 2011-09-09 18:53:56 -0700 (Fri, 09 Sep 2011)
New Revision: 16770
Modified:
django/trunk/django/forms/formsets.py
django/trunk/docs/topics/forms/formsets.txt
django/trunk/tests/regressiontests/forms/tests/formsets.py
Log:
Make ``Formset.__getitem__`` O(1), rather than O(n). If you override
``__iter__`` you now need to also override ``__getitem__`` for consistant
behavior. Thanks to Carl and Russ for the review.
Modified: django/trunk/django/forms/formsets.py
===================================================================
--- django/trunk/django/forms/formsets.py 2011-09-10 01:41:36 UTC (rev
16769)
+++ django/trunk/django/forms/formsets.py 2011-09-10 01:53:56 UTC (rev
16770)
@@ -55,7 +55,7 @@
def __getitem__(self, index):
"""Returns the form at the given index, based on the rendering order"""
- return list(self)[index]
+ return self.forms[index]
def __len__(self):
return len(self.forms)
Modified: django/trunk/docs/topics/forms/formsets.txt
===================================================================
--- django/trunk/docs/topics/forms/formsets.txt 2011-09-10 01:41:36 UTC (rev
16769)
+++ django/trunk/docs/topics/forms/formsets.txt 2011-09-10 01:53:56 UTC (rev
16770)
@@ -49,6 +49,10 @@
in this order, but you can change this order by providing an alternate
implementation for the :meth:`__iter__()` method.
+Formsets can also be indexed into, which returns the corresponding form. If you
+override ``__iter__``, you will need to also override ``__getitem__`` to have
+matching behavior.
+
Using initial data with a formset
---------------------------------
Modified: django/trunk/tests/regressiontests/forms/tests/formsets.py
===================================================================
--- django/trunk/tests/regressiontests/forms/tests/formsets.py 2011-09-10
01:41:36 UTC (rev 16769)
+++ django/trunk/tests/regressiontests/forms/tests/formsets.py 2011-09-10
01:53:56 UTC (rev 16770)
@@ -793,9 +793,11 @@
# Formets can override the default iteration order
class BaseReverseFormSet(BaseFormSet):
def __iter__(self):
- for form in reversed(self.forms):
- yield form
+ return reversed(self.forms)
+ def __getitem__(self, idx):
+ return super(BaseReverseFormSet, self).__getitem__(len(self) -
idx - 1)
+
ReverseChoiceFormset = formset_factory(Choice, BaseReverseFormSet,
extra=3)
reverse_formset = ReverseChoiceFormset()
@@ -911,12 +913,12 @@
# The empty forms should be equal.
self.assertEqual(empty_forms[0].as_p(), empty_forms[1].as_p())
-class TestEmptyFormSet(TestCase):
+class TestEmptyFormSet(TestCase):
"Test that an empty formset still calls clean()"
- def test_empty_formset_is_valid(self):
- EmptyFsetWontValidateFormset = formset_factory(FavoriteDrinkForm,
extra=0, formset=EmptyFsetWontValidate)
- formset = EmptyFsetWontValidateFormset(data={'form-INITIAL_FORMS':'0',
'form-TOTAL_FORMS':'0'},prefix="form")
- formset2 =
EmptyFsetWontValidateFormset(data={'form-INITIAL_FORMS':'0',
'form-TOTAL_FORMS':'1', 'form-0-name':'bah' },prefix="form")
- self.assertFalse(formset.is_valid())
- self.assertFalse(formset2.is_valid())
+ def test_empty_formset_is_valid(self):
+ EmptyFsetWontValidateFormset = formset_factory(FavoriteDrinkForm,
extra=0, formset=EmptyFsetWontValidate)
+ formset = EmptyFsetWontValidateFormset(data={'form-INITIAL_FORMS':'0',
'form-TOTAL_FORMS':'0'},prefix="form")
+ formset2 =
EmptyFsetWontValidateFormset(data={'form-INITIAL_FORMS':'0',
'form-TOTAL_FORMS':'1', 'form-0-name':'bah' },prefix="form")
+ self.assertFalse(formset.is_valid())
+ self.assertFalse(formset2.is_valid())
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
