Ticket #8962: 8962-datetime-format-r8983.2.diff

django/forms/fields.py

@@ -28 +28 @@
-from django.utils.encoding import smart_unicode, smart_str
-
-from util import ErrorList, ValidationError
-TimeInput, TimeInpu
+Input, DateTimeInput, TimeInput, SplitDateTimeWidge
-from django.core.files.uploadedfile import SimpleUploadedFile as UploadedFile
-
-__all__ = (
@@ -283 +283 @@
-)
-
-class DateField(Field):
+    widget = DateInput
-    default_error_messages = {
-        'invalid': _(u'Enter a valid date.'),
-    }
@@ -843 +844 @@
-        self.widget.choices = self.choices
-
-class SplitDateTimeField(MultiValueField):
+    widget = SplitDateTimeWidget
-    hidden_widget = SplitHiddenDateTimeWidget
-    default_error_messages = {
-        'invalid_date': _(u'Enter a valid date.'),
-        'invalid_time': _(u'Enter a valid time.'),
-    }
-
-
+input_date_formats=None, input_time_formats=None, 
-        errors = self.default_error_messages.copy()
-        if 'error_messages' in kwargs:
-            errors.update(kwargs['error_messages'])
-        fields = (
-
-
+input_formats=input_date_formats, 
+input_formats=input_time_formats, 
-        )
-        super(SplitDateTimeField, self).__init__(fields, *args, **kwargs)
-

django/forms/widgets.py

@@ -23 +23 @@
-__all__ = (
-    'Media', 'MediaDefiningClass', 'Widget', 'TextInput', 'PasswordInput',
-    'HiddenInput', 'MultipleHiddenInput',
-
+Input', 'Date
-    'Select', 'NullBooleanSelect', 'SelectMultiple', 'RadioSelect',
-    'CheckboxSelectMultiple', 'MultiWidget',
-    'SplitDateTimeWidget',
@@ -286 +286 @@
-        return mark_safe(u'<textarea%s>%s</textarea>' % (flatatt(final_attrs),
-                conditional_escape(force_unicode(value))))
-
+class DateInput(Input):
+    input_type = 'text'
+    format = '%Y-%m-%d'     # '2006-10-25'
+
+    def __init__(self, attrs=None, format=None):
+        super(DateInput, self).__init__(attrs)
+        if format:
+            self.format = format
+
+    def render(self, name, value, attrs=None):
+        if value is None:
+            value = ''
+        elif hasattr(value, 'strftime'):
+            value = datetime_safe.new_date(value)
+            value = value.strftime(self.format)
+        return super(DateInput, self).render(name, value, attrs)
+
-class DateTimeInput(Input):
-    input_type = 'text'
-    format = '%Y-%m-%d %H:%M:%S'     # '2006-10-25 14:30:59'
@@ -305 +322 @@
-
-class TimeInput(Input):
-    input_type = 'text'
+    format = '%H:%M:%S'     # '14:30:59'
-
+    def __init__(self, attrs=None, format=None):
+        super(TimeInput, self).__init__(attrs)
+        if format:
+            self.format = format
+
-    def render(self, name, value, attrs=None):
-        if value is None:
-            value = ''
-isinstance(value, time
-replace(microsecond=0
+hasattr(value, 'strftime'
+strftime(self.format
-        return super(TimeInput, self).render(name, value, attrs)
-
-class CheckboxInput(Widget):
@@ -655 +678 @@
-    """
-    A Widget that splits datetime input into two <input type="text"> boxes.
-    """
-
-
+
+
+
+
+
+
+
+
+
+
-        super(SplitDateTimeWidget, self).__init__(widgets, attrs)
-
-    def decompress(self, value):
@@ -671 +702 @@
-    def __init__(self, attrs=None):
-        widgets = (HiddenInput(attrs=attrs), HiddenInput(attrs=attrs))
-        super(SplitDateTimeWidget, self).__init__(widgets, attrs)
-

django/contrib/localflavor/generic/forms.py

@@ -36 +36 @@
-    def __init__(self, input_formats=None, *args, **kwargs):
-        input_formats = input_formats or DEFAULT_DATETIME_INPUT_FORMATS
-        super(DateTimeField, self).__init__(input_formats=input_formats, *args, **kwargs)
+
+class SplitDateTimeField(forms.SplitDateTimeField):
+    """
+    Split date and time input fields which use non-US date and time input
+    formats by default.
+    """
+    def __init__(self, input_date_formats=None, input_time_formats=None, *args, **kwargs):
+        input_date_formats = input_date_formats or DEFAULT_DATE_INPUT_FORMATS
+        super(SplitDateTimeField, self).__init__(input_date_formats=input_date_formats,
+                                                 input_time_formats=input_time_formats, *args, **kwargs)

tests/regressiontests/forms/widgets.py

@@ -1071 +1071 @@
->>> w.render('date', datetime.datetime(2006, 1, 10, 7, 30))
-u'<input type="text" class="pretty" value="2006-01-10" name="date_0" /><input type="text" class="pretty" value="07:30:00" name="date_1" />'
-
+Use 'date_format' and 'time_format' to change the way a value is displayed.
+>>> w = SplitDateTimeWidget(date_format='%d/%m/%Y', time_format='%H:%M')
+>>> w.render('date', datetime.datetime(2006, 1, 10, 7, 30))
+u'<input type="text" name="date_0" value="10/01/2006" /><input type="text" name="date_1" value="07:30" />'
+
->>> w._has_changed(datetime.datetime(2008, 5, 5, 12, 40, 00), [u'2008-05-05', u'12:40:00'])
-False
->>> w._has_changed(datetime.datetime(2008, 5, 5, 12, 40, 00), [u'2008-05-05', u'12:41:00'])
@@ -1093 +1098 @@
->>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51))
-u'<input type="text" name="date" value="2007-09-17 12:51:00" />'
-
+Use 'format' to change the way a value is displayed.
+>>> w = DateTimeInput(format='%d/%m/%Y %H:%M')
+>>> w.render('date', d)
+u'<input type="text" name="date" value="17/09/2007 12:51" />'
+
+# DateInput ###################################################################
+
+>>> w = DateInput()
+>>> w.render('date', None)
+u'<input type="text" name="date" />'
+>>> d = datetime.date(2007, 9, 17)
+>>> print d
+2007-09-17
+
+>>> w.render('date', d)
+u'<input type="text" name="date" value="2007-09-17" />'
+>>> w.render('date', datetime.date(2007, 9, 17))
+u'<input type="text" name="date" value="2007-09-17" />'
+
+We should be able to initialize from a unicode value.
+>>> w.render('date', u'2007-09-17')
+u'<input type="text" name="date" value="2007-09-17" />'
+
+Use 'format' to change the way a value is displayed.
+>>> w = DateInput(format='%d/%m/%Y')
+>>> w.render('date', d)
+u'<input type="text" name="date" value="17/09/2007" />'
+
-# TimeInput ###################################################################
-
->>> w = TimeInput()
@@ -1114 +1147 @@
->>> w.render('time', u'13:12:11')
-u'<input type="text" name="time" value="13:12:11" />'
-
+Use 'format' to change the way a value is displayed.
+>>> w = TimeInput(format='%H:%M')
+>>> w.render('time', t)
+u'<input type="text" name="time" value="12:51" />'
+
-# SplitHiddenDateTimeWidget ###################################################
-
->>> from django.forms.widgets import SplitHiddenDateTimeWidget
@@ -1121 +1159 @@
->>> w = SplitHiddenDateTimeWidget()
->>> w.render('date', '')
-u'<input type="hidden" name="date_0" /><input type="hidden" name="date_1" />'
+>>> d = datetime.datetime(2007, 9, 17, 12, 51, 34, 482548)
+>>> print d
+2007-09-17 12:51:34.482548
->>> w.render('date', d)
-u'<input type="hidden" name="date_0" value="2007-09-17" /><input type="hidden" name="date_1" value="12:51:34" />'
->>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51, 34))

AUTHORS

@@ -239 +239 @@
-    Eugene Lazutkin <http://lazutkin.com/blog/>
-    lcordier@point45.com
-    Jeong-Min Lee <falsetru@gmail.com>
+    Tai Lee <real.human@mrmachine.net>
-    Jannis Leidel <jl@websushi.org>
-    Christopher Lenz <http://www.cmlenz.net/>
-    lerouxb@gmail.com
@@ -278 +279 @@
-    Aljosa Mohorovic <aljosa.mohorovic@gmail.com>
-    Ramiro Morales <rm0@gmx.net>
-    Eric Moritz <http://eric.themoritzfamily.com/>
-    mrmachine <real.human@mrmachine.net>
-    Robin Munn <http://www.geekforgod.com/>
-    James Murty
-    msundstr

docs/ref/contrib/localflavor.txt

@@ -65 +65 @@
-    * `United States of America`_
-
-The ``django.contrib.localflavor`` package also includes a ``generic`` subpackage,
-
-
-
+ culture.
+
+those 
-Here's an example of how to use them::
-
-    from django import forms

docs/ref/forms/fields.txt

@@ -396 +396 @@
-
-.. class:: DateField(**kwargs)
-
-Text
+Date
-    * Empty value: ``None``
-    * Normalizes to: A Python ``datetime.date`` object.
-    * Validates that the given value is either a ``datetime.date``,
@@ -418 +418 @@
-    '%B %d %Y', '%B %d, %Y',            # 'October 25 2006', 'October 25, 2006'
-    '%d %B %Y', '%d %B, %Y',            # '25 October 2006', '25 October, 2006'
-
+.. versionchanged:: development version
+   The ``DateField`` previously used a ``TextInput`` widget by default. It now
+   uses a ``DateInput`` widget.
+
-``DateTimeField``
-~~~~~~~~~~~~~~~~~
-
@@ -737 +741 @@
-
-.. class:: SplitDateTimeField(**kwargs)
-
+    * Default widget: ``SplitDateTimeWidget``
+    * Empty value: ``None``
+    * Normalizes to: A Python ``datetime.datetime`` object.
+    * Validates that the given value is a ``datetime.datetime`` or string
+      formatted in a particular datetime format.
+    * Error message keys: ``required``, ``invalid``
+
+Takes two optional arguments:
+
+.. attribute:: SplitDateTimeField.input_date_formats
+
+    A list of formats used to attempt to convert a string to a valid
+    ``datetime.date`` object.
+
+If no ``input_date_formats`` argument is provided, the default input formats
+for ``DateField`` are used.
+
+.. attribute:: SplitDateTimeField.input_time_formats
+
+    A list of formats used to attempt to convert a string to a valid
+    ``datetime.time`` object.
+
+If no ``input_time_formats`` argument is provided, the default input formats
+for ``TimeField`` are used.
+
+.. versionchanged:: development version
+   The ``SplitDateTimeField`` previously used two ``TextInput`` widgets by
+   default. The ``input_date_formats`` and ``input_time_formats`` arguments
+   are also new in the development version.
+
-Fields which handle relationships
----------------------------------
-

docs/ref/forms/widgets.txt

@@ -36 +36 @@
-
-    File upload input: ``<input type='file' ...>``
-
+.. class:: DateInput
+
+    .. versionadded:: development version
+
+    Date input as a simple text box: ``<input type='text' ...>``
+
+    Takes one optional argument:
+    
+    .. attribute:: DateInput.format
+
+        The format in which this field's initial value will be displayed.
+
+    If no ``format`` argument is provided, the default format is ``'%Y-%m-%d'``.
+
-.. class:: DateTimeInput
-
-    .. versionadded:: 1.0
-
-    Date/time input as a simple text box: ``<input type='text' ...>``
-
+    Takes one optional argument:
+    
+    .. attribute:: DateTimeInput.format
+    
+        The format in which this field's initial value will be displayed.
+    
+    If no ``format`` argument is provided, the default format is ``'%Y-%m-%d %H:%M:%S'``.
+
+.. class:: TimeInput
+
+    Time input as a simple text box: ``<input type='text' ...>``
+
+    Takes one optional argument:
+    
+    .. attribute:: TimeInput.format
+    
+        The format in which this field's initial value will be displayed.
+    
+    If no ``format`` argument is provided, the default format is ``'%H:%M:%S'``.
+
+    .. versionchanged:: development version
+       The ``format`` argument is new in the development version.
+
-.. class:: Textarea
-
-    Text area: ``<textarea>...</textarea>``
@@ -91 +128 @@
-
-.. class:: SplitDateTimeWidget
-
-``TextInput`` widgets: one for the date, and one for the
-
+widgets: ``DateInput`` for the date, and ``TimeInput``
+for the 
-
+    Takes two optional arguments, ``date_format`` and ``time_format``, which
+    work just like the ``format`` argument for ``DateInput`` and ``TimeInput``.
+
-Specifying widgets
-------------------
-