aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/settings.py
diff options
context:
space:
mode:
authorTom Christie2013-03-06 12:19:39 +0000
committerTom Christie2013-03-06 12:19:39 +0000
commit1106596c80218569a56ff5ea04d759e3d0c541dd (patch)
treeabef8464aad8d551113243b430b436ce4449fee2 /rest_framework/settings.py
parent4f7b028a0a983b79ebca63b2ba48ce97e7a06175 (diff)
downloaddjango-rest-framework-1106596c80218569a56ff5ea04d759e3d0c541dd.tar.bz2
Clean ups to datetime formatting
Diffstat (limited to 'rest_framework/settings.py')
-rw-r--r--rest_framework/settings.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 02d751e1..eede0c5a 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -22,7 +22,7 @@ from __future__ import unicode_literals
from django.conf import settings
from django.utils import importlib
-from rest_framework import ISO8601
+from rest_framework import ISO_8601
from rest_framework.compat import six
@@ -82,19 +82,19 @@ DEFAULTS = {
# Input and output formats
'DATE_INPUT_FORMATS': (
- ISO8601,
+ ISO_8601,
),
- 'DATE_OUTPUT_FORMAT': ISO8601,
+ 'DATE_FORMAT': ISO_8601,
'DATETIME_INPUT_FORMATS': (
- ISO8601,
+ ISO_8601,
),
- 'DATETIME_OUTPUT_FORMAT': ISO8601,
+ 'DATETIME_FORMAT': ISO_8601,
'TIME_INPUT_FORMATS': (
- ISO8601,
+ ISO_8601,
),
- 'TIME_OUTPUT_FORMAT': ISO8601,
+ 'TIME_FORMAT': ISO_8601,
}