From 2fb5a51fa3ac276efc7121ec9de91f092a986104 Mon Sep 17 00:00:00 2001 From: Bouke Haarsma Date: Tue, 15 Oct 2013 22:36:49 +0200 Subject: Fixed #18659 -- Deprecated request.REQUEST and MergeDict Thanks Aymeric Augustin for the suggestion. --- tests/forms_tests/tests/test_forms.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'tests/forms_tests') diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py index 33cf24f7c6..e971860909 100644 --- a/tests/forms_tests/tests/test_forms.py +++ b/tests/forms_tests/tests/test_forms.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import copy import datetime +import warnings from django.core.files.uploadedfile import SimpleUploadedFile from django.core.validators import RegexValidator @@ -560,9 +561,12 @@ class FormsTestCase(TestCase): f = SongForm(data) self.assertEqual(f.errors, {}) - data = MergeDict(MultiValueDict(dict(name=['Yesterday'], composers=['J', 'P']))) - f = SongForm(data) - self.assertEqual(f.errors, {}) + # MergeDict is deprecated, but is supported until removed. + with warnings.catch_warnings(record=True): + warnings.simplefilter("always") + data = MergeDict(MultiValueDict(dict(name=['Yesterday'], composers=['J', 'P']))) + f = SongForm(data) + self.assertEqual(f.errors, {}) def test_multiple_hidden(self): class SongForm(Form): -- cgit v1.3