From d54c67d79d0f5661ef33d860efe80a4272e22b3e Mon Sep 17 00:00:00 2001
From: Tymur Maryokhin
Date: Thu, 4 Dec 2014 03:11:42 +0100
Subject: Removed custom StringIO, force_text, smart_text compat

---
 rest_framework/compat.py | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

(limited to 'rest_framework/compat.py')

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index eefaf22e..91723b45 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -9,31 +9,19 @@ from __future__ import unicode_literals
 import inspect
 
 from django.core.exceptions import ImproperlyConfigured
+from django.utils.encoding import force_text
 from django.conf import settings
 from django.utils import six
 import django
 
 
-# Handle django.utils.encoding rename in 1.5 onwards.
-# smart_unicode -> smart_text
-# force_unicode -> force_text
-try:
-    from django.utils.encoding import smart_text
-except ImportError:
-    from django.utils.encoding import smart_unicode as smart_text
-try:
-    from django.utils.encoding import force_text
-except ImportError:
-    from django.utils.encoding import force_unicode as force_text
-
-
 # OrderedDict only available in Python 2.7.
 # This will always be the case in Django 1.7 and above, as these versions
 # no longer support Python 2.6.
 # For Django <= 1.6 and Python 2.6 fall back to OrderedDict.
 try:
     from collections import OrderedDict
-except:
+except ImportError:
     from django.utils.datastructures import SortedDict as OrderedDict
 
 
@@ -72,21 +60,13 @@ if 'guardian' in settings.INSTALLED_APPS:
         pass
 
 
-# cStringIO only if it's available, otherwise StringIO
-try:
-    import cStringIO.StringIO as StringIO
-except ImportError:
-    StringIO = six.StringIO
-
-BytesIO = six.BytesIO
-
-
 # urlparse compat import (Required because it changed in python 3.x)
 try:
     from urllib import parse as urlparse
 except ImportError:
     import urlparse
 
+
 # UserDict moves in Python 3
 try:
     from UserDict import UserDict
@@ -104,14 +84,6 @@ def get_model_name(model_cls):
         return model_cls._meta.module_name
 
 
-def get_concrete_model(model_cls):
-    try:
-        return model_cls._meta.concrete_model
-    except AttributeError:
-        # 1.3 does not include concrete model
-        return model_cls
-
-
 # View._allowed_methods only present from 1.5 onwards
 if django.VERSION >= (1, 5):
     from django.views.generic import View
-- 
cgit v1.2.3