Merge pull request #23 from philall/master

fix import error

Author: jpadilla

requirements-test.txt

@@ -1,6 +1,6 @@
 Django>=1.6
 djangorestframework>=2.4.3
-pytest-django==2.6
-pytest==2.5.2
-pytest-cov==1.6
-flake8==2.2.2
+pytest-django==3.1.2
+pytest==3.1.3
+pytest-cov==2.5.1
+flake8==3.3.0

rest_framework_xml/renderers.py

@@ -6,7 +6,7 @@
 from django.utils import six
 from django.utils.xmlutils import SimplerXMLGenerator
 from django.utils.six.moves import StringIO
-from django.utils.encoding import smart_text
+from django.utils.encoding import force_text
 from rest_framework.renderers import BaseRenderer
 
 
@@ -58,4 +58,4 @@ def _to_xml(self, xml, data):
             pass
 
         else:
-            xml.characters(smart_text(data))
+            xml.characters(force_text(data))

tests/test_parsers.py

@@ -4,7 +4,7 @@
 
 
 from django.test import TestCase
-from django.utils import unittest
+from django.test.utils import skipUnless
 from django.utils.six.moves import StringIO
 from rest_framework_xml.parsers import XMLParser
 from rest_framework_xml.compat import etree
@@ -53,13 +53,13 @@ def setUp(self):
             ]
         }
 
-    @unittest.skipUnless(etree, 'defusedxml not installed')
+    @skipUnless(etree, 'defusedxml not installed')
     def test_parse(self):
         parser = XMLParser()
         data = parser.parse(self._input)
         self.assertEqual(data, self._data)
 
-    @unittest.skipUnless(etree, 'defusedxml not installed')
+    @skipUnless(etree, 'defusedxml not installed')
     def test_complex_data_parse(self):
         parser = XMLParser()
         data = parser.parse(self._complex_data_input)

tests/test_renderers.py

@@ -5,8 +5,9 @@
 from decimal import Decimal
 
 from django.test import TestCase
-from django.utils import unittest
+from django.test.utils import skipUnless
 from django.utils.six.moves import StringIO
+from django.utils.translation import gettext_lazy
 from rest_framework_xml.renderers import XMLRenderer
 from rest_framework_xml.parsers import XMLParser
 from rest_framework_xml.compat import etree
@@ -97,7 +98,13 @@ def test_render_list(self):
         self.assertXMLContains(content, '<sub_data_list><list-item>')
         self.assertXMLContains(content, '</list-item></sub_data_list>')
 
-    @unittest.skipUnless(etree, 'defusedxml not installed')
+    def test_render_lazy(self):
+        renderer = XMLRenderer()
+        lazy = gettext_lazy('hello')
+        content = renderer.render({'field': lazy}, 'application/xml')
+        self.assertXMLContains(content, '<field>hello</field>')
+
+    @skipUnless(etree, 'defusedxml not installed')
     def test_render_and_parse_complex_data(self):
         """
         Test XML rendering.