aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/utils
diff options
context:
space:
mode:
authorXavier Ordoquy2013-01-03 11:41:07 +0100
committerXavier Ordoquy2013-01-03 11:41:07 +0100
commit60250f22c8e144494f372338c16a2167cccb319d (patch)
treea467ab51837175ab29abec7eb22bb936375763da /rest_framework/utils
parentcf51dcc9bb409fb985d5aa09c426d1ed33f6e9b4 (diff)
downloaddjango-rest-framework-60250f22c8e144494f372338c16a2167cccb319d.tar.bz2
Move the various compat things to the compat module.
Diffstat (limited to 'rest_framework/utils')
-rw-r--r--rest_framework/utils/__init__.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/rest_framework/utils/__init__.py b/rest_framework/utils/__init__.py
index 45879353..1603f972 100644
--- a/rest_framework/utils/__init__.py
+++ b/rest_framework/utils/__init__.py
@@ -1,13 +1,7 @@
-
-import six
-
-try:
- from django.utils.encoding import smart_text
-except ImportError:
- from django.utils.encoding import smart_unicode as smart_text
-
from django.utils.xmlutils import SimplerXMLGenerator
from rest_framework.compat import StringIO
+from rest_framework.compat import six
+from rest_framework.compat import smart_text
import re
import xml.etree.ElementTree as ET