Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #8898 -- Obsoleted SplitDateTimeWidget usage with DateTimeField

Thanks Tim Graham for the review.
  • Loading branch information...
commit 0179852d7faf461d55cf3ae69393abb3f3cd2910 1 parent 1e9e735
@claudep claudep authored
View
4 django/forms/fields.py
@@ -486,6 +486,10 @@ def to_python(self, value):
if isinstance(value, list):
# Input comes from a SplitDateTimeWidget, for example. So, it's two
# components: date and time.
+ warnings.warn(
+ 'Using SplitDateTimeWidget with DateTimeField is deprecated. '
+ 'Use SplitDateTimeField instead.',
+ PendingDeprecationWarning, stacklevel=2)
if len(value) != 2:
raise ValidationError(self.error_messages['invalid'], code='invalid')
if value[0] in self.empty_values and value[1] in self.empty_values:
View
3  docs/internals/deprecation.txt
@@ -215,6 +215,9 @@ these changes.
* ``django.forms.get_declared_fields`` will be removed.
+* The ability to use a ``SplitDateTimeWidget`` with ``DateTimeField`` will be
+ removed.
+
* The ``WSGIRequest.REQUEST`` property will be removed.
* The class ``django.utils.datastructures.MergeDict`` will be removed.
View
6 docs/ref/forms/fields.txt
@@ -458,6 +458,12 @@ For each field, we describe the default widget used if you don't specify
See also :ref:`format localization <format-localization>`.
+ .. deprecated:: 1.7
+
+ The ability to use :class:`SplitDateTimeWidget` with ``DateTimeField``
+ has been deprecated and will be removed in Django 1.9. Use
+ :class:`SplitDateTimeField` instead.
+
``DecimalField``
~~~~~~~~~~~~~~~~
View
7 docs/releases/1.7.txt
@@ -1063,3 +1063,10 @@ the arguments may have been evaluated at query time.
The ``ADMIN_FOR`` feature, part of the admindocs, has been removed. You can
remove the setting from your configuration at your convenience.
+
+``SplitDateTimeWidget`` with ``DateTimeField``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``SplitDateTimeWidget`` support in :class:`~django.forms.DateTimeField` is
+deprecated, use ``SplitDateTimeWidget`` with
+:class:`~django.forms.SplitDateTimeField` instead.
View
21 tests/forms_tests/tests/test_widgets.py
@@ -3,6 +3,7 @@
import copy
import datetime
+import warnings
from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
from django.core.files.uploadedfile import SimpleUploadedFile
@@ -1092,18 +1093,22 @@ def test_13390(self):
class SplitDateForm(Form):
field = DateTimeField(widget=SplitDateTimeWidget, required=False)
- form = SplitDateForm({'field': ''})
- self.assertTrue(form.is_valid())
- form = SplitDateForm({'field': ['', '']})
- self.assertTrue(form.is_valid())
+ with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=PendingDeprecationWarning)
+ form = SplitDateForm({'field': ''})
+ self.assertTrue(form.is_valid())
+ form = SplitDateForm({'field': ['', '']})
+ self.assertTrue(form.is_valid())
class SplitDateRequiredForm(Form):
field = DateTimeField(widget=SplitDateTimeWidget, required=True)
- form = SplitDateRequiredForm({'field': ''})
- self.assertFalse(form.is_valid())
- form = SplitDateRequiredForm({'field': ['', '']})
- self.assertFalse(form.is_valid())
+ with warnings.catch_warnings():
+ warnings.filterwarnings("ignore", category=PendingDeprecationWarning)
+ form = SplitDateRequiredForm({'field': ''})
+ self.assertFalse(form.is_valid())
+ form = SplitDateRequiredForm({'field': ['', '']})
+ self.assertFalse(form.is_valid())
class LiveWidgetTests(AdminSeleniumWebDriverTestCase):
Please sign in to comment.
Something went wrong with that request. Please try again.