aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/metadata.py
diff options
context:
space:
mode:
authorTom Christie2014-12-05 13:14:14 +0000
committerTom Christie2014-12-05 13:14:14 +0000
commit65d6cba75f9db0995020f01e9144b6660feb47d6 (patch)
tree1212187336ad9f887a4c69dc805506d49f42b86e /rest_framework/metadata.py
parent9fb1b396db751234a531dabacb6758ac2645776c (diff)
parentd9930181ee157f51e2fcea33a3af5ea397647324 (diff)
downloaddjango-rest-framework-65d6cba75f9db0995020f01e9144b6660feb47d6.tar.bz2
Merge pull request #2200 from maryokhin/master
Clean up compat code
Diffstat (limited to 'rest_framework/metadata.py')
-rw-r--r--rest_framework/metadata.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py
index de829d00..3b058fab 100644
--- a/rest_framework/metadata.py
+++ b/rest_framework/metadata.py
@@ -1,17 +1,18 @@
"""
-The metadata API is used to allow cusomization of how `OPTIONS` requests
+The metadata API is used to allow customization of how `OPTIONS` requests
are handled. We currently provide a single default implementation that returns
some fairly ad-hoc information about the view.
-Future implementations might use JSON schema or other definations in order
+Future implementations might use JSON schema or other definitions in order
to return this information in a more standardized way.
"""
from __future__ import unicode_literals
from django.core.exceptions import PermissionDenied
from django.http import Http404
+from django.utils.encoding import force_text
from rest_framework import exceptions, serializers
-from rest_framework.compat import force_text, OrderedDict
+from rest_framework.compat import OrderedDict
from rest_framework.request import clone_request
from rest_framework.utils.field_mapping import ClassLookupDict