aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/relations.py
diff options
context:
space:
mode:
authorBrandon Cazander2015-01-28 17:08:34 -0800
committerBrandon Cazander2015-02-02 20:37:33 -0800
commit77d061d234e03004f34058028707ecddfc730fae (patch)
treeb67e2414ba475a2122cb46dcd737b1a39b92911e /rest_framework/relations.py
parente63f49bd1d55501f766ca2e3f9c0c9fa3cfa19ab (diff)
downloaddjango-rest-framework-77d061d234e03004f34058028707ecddfc730fae.tar.bz2
Provide rest_framework.resolve. Fixes #2489
Diffstat (limited to 'rest_framework/relations.py')
-rw-r--r--rest_framework/relations.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index 66857a41..809d3db9 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -1,7 +1,7 @@
# coding: utf-8
from __future__ import unicode_literals
from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
-from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch, Resolver404
+from django.core.urlresolvers import get_script_prefix, NoReverseMatch, Resolver404
from django.db.models.query import QuerySet
from django.utils import six
from django.utils.encoding import smart_text
@@ -9,7 +9,7 @@ from django.utils.six.moves.urllib import parse as urlparse
from django.utils.translation import ugettext_lazy as _
from rest_framework.compat import OrderedDict
from rest_framework.fields import get_attribute, empty, Field
-from rest_framework.reverse import reverse
+from rest_framework.reverse import reverse, resolve
from rest_framework.utils import html
@@ -205,6 +205,7 @@ class HyperlinkedRelatedField(RelatedField):
return self.reverse(view_name, kwargs=kwargs, request=request, format=format)
def to_internal_value(self, data):
+ request = self.context.get('request', None)
try:
http_prefix = data.startswith(('http:', 'https:'))
except AttributeError:
@@ -218,7 +219,7 @@ class HyperlinkedRelatedField(RelatedField):
data = '/' + data[len(prefix):]
try:
- match = self.resolve(data)
+ match = self.resolve(data, request=request)
except Resolver404:
self.fail('no_match')