summaryrefslogtreecommitdiff
path: root/django/forms/fields.py
diff options
context:
space:
mode:
authorMarc Garcia <garcia.marc@gmail.com>2009-08-14 14:10:14 +0000
committerMarc Garcia <garcia.marc@gmail.com>2009-08-14 14:10:14 +0000
commita7beb20bf02b93b3beb6d694d888c904be9bc9ea (patch)
tree6df7bde8fc02d026bcd67b61db4f499c565602b1 /django/forms/fields.py
parentad9f56aad62d4f5e623fa5f553e84971832a39ee (diff)
[soc2009/i18n] Tests improved, and bugs fixed on and because of tests. All tests now validate.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/i18n-improvements@11451 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/forms/fields.py')
-rw-r--r--django/forms/fields.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index c9a069edfd..fb40f87248 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -285,7 +285,7 @@ class DateField(Field):
def __init__(self, input_formats=None, *args, **kwargs):
super(DateField, self).__init__(*args, **kwargs)
- self.input_formats = input_formats or getformat('DATE_INPUT_FORMATS')
+ self.input_formats = input_formats
def clean(self, value):
"""
@@ -299,7 +299,7 @@ class DateField(Field):
return value.date()
if isinstance(value, datetime.date):
return value
- for format in self.input_formats:
+ for format in self.input_formats or getformat('DATE_INPUT_FORMATS'):
try:
return datetime.date(*time.strptime(value, format)[:3])
except ValueError:
@@ -314,7 +314,7 @@ class TimeField(Field):
def __init__(self, input_formats=None, *args, **kwargs):
super(TimeField, self).__init__(*args, **kwargs)
- self.input_formats = input_formats or getformat('TIME_INPUT_FORMATS')
+ self.input_formats = input_formats
def clean(self, value):
"""
@@ -326,7 +326,7 @@ class TimeField(Field):
return None
if isinstance(value, datetime.time):
return value
- for format in self.input_formats:
+ for format in self.input_formats or getformat('TIME_INPUT_FORMATS'):
try:
return datetime.time(*time.strptime(value, format)[3:6])
except ValueError:
@@ -341,7 +341,7 @@ class DateTimeField(Field):
def __init__(self, input_formats=None, *args, **kwargs):
super(DateTimeField, self).__init__(*args, **kwargs)
- self.input_formats = input_formats or getformat('DATETIME_INPUT_FORMATS')
+ self.input_formats = input_formats
def clean(self, value):
"""
@@ -361,7 +361,7 @@ class DateTimeField(Field):
if len(value) != 2:
raise ValidationError(self.error_messages['invalid'])
value = '%s %s' % tuple(value)
- for format in self.input_formats:
+ for format in self.input_formats or getformat('DATETIME_INPUT_FORMATS'):
try:
return datetime.datetime(*time.strptime(value, format)[:6])
except ValueError: