Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion rest_framework_xml/renderers.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

from django.utils import six
from django.utils.xmlutils import SimplerXMLGenerator
from rest_framework.compat import StringIO, smart_text
from django.utils.six.moves import StringIO
from django.utils.encoding import smart_text
from rest_framework.renderers import BaseRenderer


Expand Down
2 changes: 1 addition & 1 deletion tests/test_parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from django.test import TestCase
from django.utils import unittest
from rest_framework.compat import StringIO
from django.utils.six.moves import StringIO
from rest_framework_xml.parsers import XMLParser
from rest_framework_xml.compat import etree

Expand Down
2 changes: 1 addition & 1 deletion tests/test_renderers.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from django.test import TestCase
from django.utils import unittest
from rest_framework.compat import StringIO
from django.utils.six.moves import StringIO
from rest_framework_xml.renderers import XMLRenderer
from rest_framework_xml.parsers import XMLParser
from rest_framework_xml.compat import etree
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
envlist =
py27-{flake8,docs},
{py27,py33,py34}-django{1.6,1.7}-drf{2.4.3,2.4.4,3.0}
{py27,py33,py34}-django{1.6,1.7}-drf{2.4.3,2.4.4,3.0.0}

[testenv]
commands = ./runtests.py --fast
Expand Down