diff options
| author | Tom Christie | 2013-02-22 13:17:22 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-02-22 13:17:22 +0000 |
| commit | dcee027fa97f015ff3b87f0fd72b7995cdd6e155 (patch) | |
| tree | 676f581fe03c4a3e01d479756c590f75dc4aab4a /rest_framework/tests/renderers.py | |
| parent | b261515afa18a5d2a38d729b174bbd99ddee14ac (diff) | |
| download | django-rest-framework-dcee027fa97f015ff3b87f0fd72b7995cdd6e155.tar.bz2 | |
defusedxml for security fix.
As per:
http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html
Diffstat (limited to 'rest_framework/tests/renderers.py')
| -rw-r--r-- | rest_framework/tests/renderers.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/rest_framework/tests/renderers.py b/rest_framework/tests/renderers.py index 90ef1221..0f3fe3f1 100644 --- a/rest_framework/tests/renderers.py +++ b/rest_framework/tests/renderers.py @@ -1,23 +1,21 @@ -import pickle -import re - +from decimal import Decimal from django.core.cache import cache from django.test import TestCase from django.test.client import RequestFactory - +from django.utils import unittest from rest_framework import status, permissions -from rest_framework.compat import yaml, patterns, url, include +from rest_framework.compat import yaml, etree, patterns, url, include from rest_framework.response import Response from rest_framework.views import APIView from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \ XMLRenderer, JSONPRenderer, BrowsableAPIRenderer from rest_framework.parsers import YAMLParser, XMLParser from rest_framework.settings import api_settings - from rest_framework.compat import StringIO from rest_framework.compat import six import datetime -from decimal import Decimal +import pickle +import re DUMMYSTATUS = status.HTTP_200_OK @@ -410,6 +408,7 @@ class XMLRendererTestCase(TestCase): self.assertXMLContains(content, '<sub_name>first</sub_name>') self.assertXMLContains(content, '<sub_name>second</sub_name>') + @unittest.skipUnless(etree, 'defusedxml not installed') def test_render_and_parse_complex_data(self): """ Test XML rendering. |
