From 63d02dbea855a060ec4cdb194497188e2f40cb66 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 19 Aug 2014 17:06:55 +0100
Subject: Drop six from compat. 1.4.2 is now the lowest supported version.

---
 rest_framework/compat.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'rest_framework/compat.py')

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 4b16a8ca..fa0f0bfb 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -9,14 +9,9 @@ import django
 import inspect
 from django.core.exceptions import ImproperlyConfigured
 from django.conf import settings
+from django.utils import six
 
 
-# Try to import six from Django, fallback to external `six` package.
-try:
-    from django.utils import six
-except ImportError:
-    import six
-
 # Handle django.utils.encoding rename in 1.5 onwards.
 # smart_unicode -> smart_text
 # force_unicode -> force_text
-- 
cgit v1.2.3