From 4c1029971e810cde32ee4cd489627239b9b1b6ed Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 1 Jul 2013 09:36:31 -0400 Subject: [PATCH] [1.6.x] Fixed a couple form/formset deprecation warnings in tests. Backport of a521d10322 from master. --- tests/model_forms/tests.py | 2 ++ tests/model_formsets/tests.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py index 39be824798..19f0216ec7 100644 --- a/tests/model_forms/tests.py +++ b/tests/model_forms/tests.py @@ -252,10 +252,12 @@ class StatusNoteCBM2mForm(forms.ModelForm): fields = '__all__' widgets = {'status': forms.CheckboxSelectMultiple} + class CustomErrorMessageForm(forms.ModelForm): name1 = forms.CharField(error_messages={'invalid': 'Form custom error message.'}) class Meta: + fields = '__all__' model = CustomErrorMessage diff --git a/tests/model_formsets/tests.py b/tests/model_formsets/tests.py index 43509c471f..09a3ba1778 100644 --- a/tests/model_formsets/tests.py +++ b/tests/model_formsets/tests.py @@ -399,7 +399,7 @@ class ModelFormsetTest(TestCase): super(BaseAuthorFormSet, self).__init__(*args, **kwargs) self.queryset = Author.objects.filter(name__startswith='Charles') - AuthorFormSet = modelformset_factory(Author, formset=BaseAuthorFormSet) + AuthorFormSet = modelformset_factory(Author, fields='__all__', formset=BaseAuthorFormSet) formset = AuthorFormSet() self.assertEqual(len(formset.get_queryset()), 1)