diff options
| author | Tom Christie | 2014-12-03 23:12:52 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-12-03 23:12:52 +0000 |
| commit | 6369f9212588c849c0ade41c135d229bfbe4a5cf (patch) | |
| tree | 0026a0eef3be16c2cc3b0eb70b41a4e6740154a5 /rest_framework/compat.py | |
| parent | af23ec36bbf4ccb8f4179e790b49b11677ccf6ee (diff) | |
| parent | 9680329cb0648fbf559d6d935e4220d5b4d3b87c (diff) | |
| download | django-rest-framework-6369f9212588c849c0ade41c135d229bfbe4a5cf.tar.bz2 | |
Merge
Diffstat (limited to 'rest_framework/compat.py')
| -rw-r--r-- | rest_framework/compat.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/rest_framework/compat.py b/rest_framework/compat.py index da2496d8..06da3770 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -244,13 +244,6 @@ except ImportError: yaml = None -# XML is optional -try: - import defusedxml.ElementTree as etree -except ImportError: - etree = None - - # `seperators` argument to `json.dumps()` differs between 2.x and 3.x # See: http://bugs.python.org/issue22767 if six.PY3: |