diff options
| author | Tymur Maryokhin | 2014-12-04 03:11:42 +0100 | 
|---|---|---|
| committer | Tymur Maryokhin | 2014-12-04 03:11:42 +0100 | 
| commit | d54c67d79d0f5661ef33d860efe80a4272e22b3e (patch) | |
| tree | 0ef9ba48601c388545efd3f5d86d143ae9b1eeee /tests | |
| parent | 09e59f268619927dc22f15fed97c3ceac05ea306 (diff) | |
| download | django-rest-framework-d54c67d79d0f5661ef33d860efe80a4272e22b3e.tar.bz2 | |
Removed custom StringIO, force_text, smart_text compat
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_description.py | 4 | ||||
| -rw-r--r-- | tests/test_parsers.py | 2 | ||||
| -rw-r--r-- | tests/test_renderers.py | 4 | 
3 files changed, 6 insertions, 4 deletions
| diff --git a/tests/test_description.py b/tests/test_description.py index 6cd871ed..78ce2350 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -2,8 +2,8 @@  from __future__ import unicode_literals  from django.test import TestCase -from django.utils.encoding import python_2_unicode_compatible -from rest_framework.compat import apply_markdown, smart_text +from django.utils.encoding import python_2_unicode_compatible, smart_text +from rest_framework.compat import apply_markdown  from rest_framework.views import APIView  from .description import ViewWithNonASCIICharactersInDocstring  from .description import UTF8_TEST_DOCSTRING diff --git a/tests/test_parsers.py b/tests/test_parsers.py index 88eccef3..d28d8bd4 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -5,8 +5,8 @@ from django import forms  from django.core.files.uploadhandler import MemoryFileUploadHandler  from django.test import TestCase  from django.utils import unittest +from django.utils.six.moves import StringIO  from rest_framework.compat import etree -from rest_framework.compat import StringIO  from rest_framework.exceptions import ParseError  from rest_framework.parsers import FormParser, FileUploadParser  from rest_framework.parsers import XMLParser diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 416d7f22..22eb5459 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -7,9 +7,11 @@ from django.core.cache import cache  from django.db import models  from django.test import TestCase  from django.utils import six, unittest +from django.utils.six import BytesIO +from django.utils.six.moves import StringIO  from django.utils.translation import ugettext_lazy as _  from rest_framework import status, permissions -from rest_framework.compat import yaml, etree, StringIO, BytesIO +from rest_framework.compat import yaml, etree  from rest_framework.response import Response  from rest_framework.views import APIView  from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \ | 
