Skip to content

Commit 89138b3

Browse files
committed
Merge pull request #4 from brandoncazander/master
Don't import StringIO or smart_text from rest_framework.compat.
2 parents 0953a7d + a0c48a8 commit 89138b3

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

rest_framework_xml/renderers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
from django.utils import six
77
from django.utils.xmlutils import SimplerXMLGenerator
8-
from rest_framework.compat import StringIO, smart_text
8+
from django.utils.six.moves import StringIO
9+
from django.utils.encoding import smart_text
910
from rest_framework.renderers import BaseRenderer
1011

1112

tests/test_parsers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from django.test import TestCase
77
from django.utils import unittest
8-
from rest_framework.compat import StringIO
8+
from django.utils.six.moves import StringIO
99
from rest_framework_xml.parsers import XMLParser
1010
from rest_framework_xml.compat import etree
1111

tests/test_renderers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from django.test import TestCase
88
from django.utils import unittest
9-
from rest_framework.compat import StringIO
9+
from django.utils.six.moves import StringIO
1010
from rest_framework_xml.renderers import XMLRenderer
1111
from rest_framework_xml.parsers import XMLParser
1212
from rest_framework_xml.compat import etree

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
33
py27-{flake8,docs},
4-
{py27,py33,py34}-django{1.6,1.7}-drf{2.4.3,2.4.4,3.0}
4+
{py27,py33,py34}-django{1.6,1.7}-drf{2.4.3,2.4.4,3.0.0}
55

66
[testenv]
77
commands = ./runtests.py --fast

0 commit comments

Comments
 (0)