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/parsers.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/parsers.py')
| -rw-r--r-- | rest_framework/parsers.py | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index 4990971b..aa4fd3f1 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -10,7 +10,8 @@ from django.core.files.uploadhandler import StopFutureHandlers  from django.http import QueryDict  from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser  from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter -from rest_framework.compat import etree, six, yaml, force_text +from django.utils import six +from rest_framework.compat import etree, yaml, force_text  from rest_framework.exceptions import ParseError  from rest_framework import renderers  import json | 
