Skip to content

Commit 9a24ffd

Browse files
committed
removing the skipUnless code broke the linter validation, so I readded it
1 parent d085a68 commit 9a24ffd

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

rest_framework_xml/parsers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def parse(self, stream, media_type=None, parser_context=None):
3939

4040
def _check_xml_list(self, element):
4141
"""
42-
Checks that an element has multiple tags and that they are all the same,
42+
Checks that an element has multiple tags and that they are all the same,
4343
to validate that the element is a properly formatted list
4444
"""
4545
return len(element) > 1 and len(set([child.tag for child in element])) <= 1

tests/test_parsers.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55

66
from django.test import TestCase
7+
from django.utils import unittest
78
from django.utils.six.moves import StringIO
89
from rest_framework_xml.parsers import XMLParser
910
from rest_framework_xml.compat import etree
@@ -95,21 +96,25 @@ def setUp(self):
9596
]
9697
}
9798

99+
@unittest.skipUnless(etree, 'defusedxml not installed')
98100
def test_parse(self):
99101
parser = XMLParser()
100102
data = parser.parse(self._input)
101103
self.assertEqual(data, self._data)
102104

105+
@unittest.skipUnless(etree, 'defusedxml not installed')
103106
def test_complex_data_parse(self):
104107
parser = XMLParser()
105108
data = parser.parse(self._complex_data_input)
106109
self.assertEqual(data, self._complex_data)
107110

111+
@unittest.skipUnless(etree, 'defusedxml not installed')
108112
def test_invalid_list_parse(self):
109113
parser = XMLParser()
110114
data = parser.parse(self._invalid_list_input)
111115
self.assertEqual(data, self._invalid_list_output)
112116

117+
@unittest.skipUnless(etree, 'defusedxml not installed')
113118
def test_valid_list_parse(self):
114119
parser = XMLParser()
115120
data = parser.parse(self._valid_list_input)

tests/test_renderers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from decimal import Decimal
66

77
from django.test import TestCase
8+
from django.utils import unittest
89
from django.utils.six.moves import StringIO
910
from rest_framework_xml.renderers import XMLRenderer
1011
from rest_framework_xml.parsers import XMLParser
@@ -96,6 +97,7 @@ def test_render_list(self):
9697
self.assertXMLContains(content, '<sub_data_list><list-item>')
9798
self.assertXMLContains(content, '</list-item></sub_data_list>')
9899

100+
@unittest.skipUnless(etree, 'defusedxml not installed')
99101
def test_render_and_parse_complex_data(self):
100102
"""
101103
Test XML rendering.

0 commit comments

Comments
 (0)