aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/parsers.py
diff options
context:
space:
mode:
authorTom Christie2013-02-22 11:49:57 -0800
committerTom Christie2013-02-22 11:49:57 -0800
commitcf6c95de0112eb7d1c524849e907b586513cdf63 (patch)
treeafb8c1b3fb18fba9af370e7afffd7458d730d7c3 /rest_framework/tests/parsers.py
parenta39de47cc7e6861a1d06b8ab1893f7358cf281f9 (diff)
parent78da724964019e33bfa5d9f05db2806d85816c2d (diff)
downloaddjango-rest-framework-cf6c95de0112eb7d1c524849e907b586513cdf63.tar.bz2
Merge pull request #673 from tomchristie/defusedxml
XML Security fixes
Diffstat (limited to 'rest_framework/tests/parsers.py')
-rw-r--r--rest_framework/tests/parsers.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/rest_framework/tests/parsers.py b/rest_framework/tests/parsers.py
index c03df08f..539c5b44 100644
--- a/rest_framework/tests/parsers.py
+++ b/rest_framework/tests/parsers.py
@@ -2,6 +2,8 @@ from __future__ import unicode_literals
from rest_framework.compat import StringIO
from django import forms
from django.test import TestCase
+from django.utils import unittest
+from rest_framework.compat import etree
from rest_framework.parsers import FormParser
from rest_framework.parsers import XMLParser
import datetime
@@ -69,11 +71,13 @@ class TestXMLParser(TestCase):
]
}
+ @unittest.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')
def test_complex_data_parse(self):
parser = XMLParser()
data = parser.parse(self._complex_data_input)