diff options
| author | Claude Paroz <claude@2xlibre.net> | 2013-03-02 18:01:24 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2013-03-02 18:11:10 +0100 |
| commit | 384c180e414a982a6cc5ccabc675bcfb4fd80988 (patch) | |
| tree | c37afdbf422603b646bb470ef433c7e8f48a3517 /django | |
| parent | fe5d9fe5fec2617b9eb8564df77ba5324834cadc (diff) | |
Fixed #19917 -- Added microseconds in default TIME_INPUT_FORMATS
Thanks minddust for the report.
Diffstat (limited to 'django')
| -rw-r--r-- | django/conf/global_settings.py | 1 | ||||
| -rw-r--r-- | django/utils/formats.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 13213d0cbb..42df4b601a 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -365,6 +365,7 @@ DATE_INPUT_FORMATS = ( # * Note that these format strings are different from the ones to display dates TIME_INPUT_FORMATS = ( '%H:%M:%S', # '14:30:59' + '%H:%M:%S.%f', # '14:30:59.000200' '%H:%M', # '14:30' ) diff --git a/django/utils/formats.py b/django/utils/formats.py index f0abdc2f7b..cc66149026 100644 --- a/django/utils/formats.py +++ b/django/utils/formats.py @@ -19,7 +19,7 @@ _format_modules_cache = {} ISO_INPUT_FORMATS = { 'DATE_INPUT_FORMATS': ('%Y-%m-%d',), - 'TIME_INPUT_FORMATS': ('%H:%M:%S', '%H:%M'), + 'TIME_INPUT_FORMATS': ('%H:%M:%S', '%H:%M:%S.%f', '%H:%M'), 'DATETIME_INPUT_FORMATS': ( '%Y-%m-%d %H:%M:%S', '%Y-%m-%d %H:%M:%S.%f', |