From 1106596c80218569a56ff5ea04d759e3d0c541dd Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 6 Mar 2013 12:19:39 +0000
Subject: Clean ups to datetime formatting

---
 rest_framework/settings.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'rest_framework/settings.py')

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,
 }
 
 
-- 
cgit v1.2.3