Move the various compat things to the compat module.

1 files changed, 2 insertions, 5 deletions

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index e59cc9b4..adea5bf5 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -1,6 +1,5 @@
 
 from __future__ import unicode_literals
-import six
 
 import copy
 import datetime
@@ -14,14 +13,12 @@ from django.conf import settings
 from django import forms
 from django.forms import widgets
 from django.utils.encoding import is_protected_type
-try:
-    from django.utils.encoding import smart_text
-except ImportError:
-    from django.utils.encoding import smart_unicode as smart_text
 from django.utils.translation import ugettext_lazy as _
 from rest_framework.compat import parse_date, parse_datetime
 from rest_framework.compat import timezone
 from rest_framework.compat import BytesIO
+from rest_framework.compat import six
+from rest_framework.compat import smart_text
 
 
 def is_simple_callable(obj):