From 728b6fd9ca8624271f072d5f4618dc3fd38e87f1 Mon Sep 17 00:00:00 2001 From: Loic Bistuer Date: Mon, 26 Jan 2015 10:28:57 +0700 Subject: Fixed #24219 -- Moved SelectDateWidget together with the other widgets and deprecated django.forms.extras. Thanks Berker Peksag and Tim Graham for the reviews. --- tests/forms_tests/tests/test_widgets.py | 3 +-- tests/i18n/forms.py | 3 +-- tests/i18n/tests.py | 11 ++++++----- 3 files changed, 8 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/forms_tests/tests/test_widgets.py b/tests/forms_tests/tests/test_widgets.py index dd8a9b4030..d46378320e 100644 --- a/tests/forms_tests/tests/test_widgets.py +++ b/tests/forms_tests/tests/test_widgets.py @@ -12,10 +12,9 @@ from django.forms import ( ChoiceField, ClearableFileInput, DateField, DateInput, DateTimeInput, FileInput, Form, HiddenInput, MultipleChoiceField, MultipleHiddenInput, MultiValueField, MultiWidget, NullBooleanSelect, PasswordInput, - RadioSelect, Select, SelectMultiple, SplitDateTimeField, + RadioSelect, Select, SelectDateWidget, SelectMultiple, SplitDateTimeField, SplitDateTimeWidget, Textarea, TextInput, TimeInput, ValidationError, ) -from django.forms.extras import SelectDateWidget from django.forms.widgets import RadioFieldRenderer from django.utils.safestring import mark_safe, SafeData from django.utils import six, translation diff --git a/tests/i18n/forms.py b/tests/i18n/forms.py index e06ed4b18d..8c290bf664 100644 --- a/tests/i18n/forms.py +++ b/tests/i18n/forms.py @@ -1,5 +1,4 @@ from django import forms -from django.forms.extras import SelectDateWidget from .models import Company @@ -14,7 +13,7 @@ class I18nForm(forms.Form): class SelectDateForm(forms.Form): - date_field = forms.DateField(widget=SelectDateWidget) + date_field = forms.DateField(widget=forms.SelectDateWidget) class CompanyForm(forms.ModelForm): diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py index f3ae0288c2..0b5714d6bf 100644 --- a/tests/i18n/tests.py +++ b/tests/i18n/tests.py @@ -11,6 +11,7 @@ import pickle from threading import local from unittest import skipUnless +from django import forms from django.conf import settings from django.template import Template, Context from django.template.base import TemplateSyntaxError @@ -36,7 +37,7 @@ from django.utils.translation import (activate, deactivate, check_for_language, string_concat, LANGUAGE_SESSION_KEY) -from .forms import I18nForm, SelectDateForm, SelectDateWidget, CompanyForm +from .forms import I18nForm, SelectDateForm, CompanyForm from .models import Company, TestModel @@ -549,7 +550,7 @@ class FormattingTests(TestCase): self.assertEqual(datetime.date(2009, 12, 31), form2.cleaned_data['date_field']) self.assertHTMLEqual( '\n\n', - SelectDateWidget(years=range(2009, 2019)).render('mydate', datetime.date(2009, 12, 31)) + forms.SelectDateWidget(years=range(2009, 2019)).render('mydate', datetime.date(2009, 12, 31)) ) # We shouldn't change the behavior of the floatformat filter re: @@ -667,14 +668,14 @@ class FormattingTests(TestCase): self.assertEqual(datetime.date(2009, 12, 31), form5.cleaned_data['date_field']) self.assertHTMLEqual( '\n\n', - SelectDateWidget(years=range(2009, 2019)).render('mydate', datetime.date(2009, 12, 31)) + forms.SelectDateWidget(years=range(2009, 2019)).render('mydate', datetime.date(2009, 12, 31)) ) # Russian locale (with E as month) with translation.override('ru', deactivate=True): self.assertHTMLEqual( '\n\n', - SelectDateWidget(years=range(2009, 2019)).render('mydate', datetime.date(2009, 12, 31)) + forms.SelectDateWidget(years=range(2009, 2019)).render('mydate', datetime.date(2009, 12, 31)) ) # English locale @@ -739,7 +740,7 @@ class FormattingTests(TestCase): self.assertEqual(datetime.date(2009, 12, 31), form6.cleaned_data['date_field']) self.assertHTMLEqual( '\n\n', - SelectDateWidget(years=range(2009, 2019)).render('mydate', datetime.date(2009, 12, 31)) + forms.SelectDateWidget(years=range(2009, 2019)).render('mydate', datetime.date(2009, 12, 31)) ) def test_sub_locales(self): -- cgit v1.3