Ticket #3672: date-time-widgets-tests-7601.diff

django/newforms/widgets.py

@@ -8 +8 @@
     from sets import Set as set   # Python 2.3 fallback
 
 import copy
+import datetime
 from itertools import chain
 
+from django.conf import settings
+from django.utils import dateformat
 from django.utils.datastructures import MultiValueDict
 from django.utils.html import escape, conditional_escape
 from django.utils.translation import ugettext
@@ -18 +21 @@
 from util import flatatt
 
 __all__ = (
-    'Widget', 'TextInput', 'PasswordInput',
+    'Widget', 'TextInput', 'DateTextInput', 'TimeTextInput', 'PasswordInput',
     'HiddenInput', 'MultipleHiddenInput',
     'FileInput', 'DateTimeInput', 'Textarea', 'CheckboxInput',
     'Select', 'NullBooleanSelect', 'SelectMultiple', 'RadioSelect',
@@ -95 +98 @@
 class TextInput(Input):
     input_type = 'text'
 
+class DateTextInput(TextInput):
+    """Renders value in text input using default or specified date format."""
+    def __init__(self, format=None, attrs=None):
+        super(DateTextInput, self).__init__(attrs)
+        self.format = format or settings.DATE_FORMAT
+
+    def render(self, name, value, attrs=None):
+        if value and (isinstance(value, datetime.date) or isinstance(value, datetime.datetime)):
+            formatted_value = dateformat.format(value, self.format)
+        else:
+            formatted_value = None
+        return super(DateTextInput, self).render(name, formatted_value, attrs)
+
+class TimeTextInput(TextInput):
+    """Renders time in text input using default or specified time format."""
+    def __init__(self, format=None, attrs=None):
+        super(TimeTextInput, self).__init__(attrs)
+        self.format = format or settings.TIMEFORMAT
+
+    def render(self, name, value, attrs=None):
+        if value and (isinstance(value, datetime.time) or isinstance(value, datetime.datetime)):
+            formatted_value = dateformat.time_format(value, self.format)
+        else:
+            formatted_value = None
+        return super(TimeTextInput, self).render(name, formatted_value, attrs)
+
 class PasswordInput(Input):
     input_type = 'password'