Skip to content

Commit

Permalink
Merge pull request #4 from brandoncazander/master
Browse files Browse the repository at this point in the history
Don't import StringIO or smart_text from rest_framework.compat.
  • Loading branch information
jpadilla committed Jan 28, 2015
2 parents 0953a7d + a0c48a8 commit 89138b3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
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

0 comments on commit 89138b3

Please sign in to comment.