diff options
| author | Tom Christie | 2014-08-19 17:06:55 +0100 | 
|---|---|---|
| committer | Tom Christie | 2014-08-19 17:06:55 +0100 | 
| commit | 63d02dbea855a060ec4cdb194497188e2f40cb66 (patch) | |
| tree | 6b928af2fb99cabf486bc15079db3cd831d8bf34 /rest_framework/compat.py | |
| parent | 00c0dfc66fd2426a63e6eec498395740b2c3e63b (diff) | |
| download | django-rest-framework-63d02dbea855a060ec4cdb194497188e2f40cb66.tar.bz2 | |
Drop six from compat. 1.4.2 is now the lowest supported version.
Diffstat (limited to 'rest_framework/compat.py')
| -rw-r--r-- | rest_framework/compat.py | 7 | 
1 files changed, 1 insertions, 6 deletions
| 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 | 
