diff options
Diffstat (limited to 'rest_framework/relations.py')
| -rw-r--r-- | rest_framework/relations.py | 19 | 
1 files changed, 13 insertions, 6 deletions
| diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 66857a41..0b7c9d86 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, resolve, NoReverseMatch, Resolver404  from django.db.models.query import QuerySet  from django.utils import six  from django.utils.encoding import smart_text @@ -167,11 +167,10 @@ class HyperlinkedRelatedField(RelatedField):          self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field)          self.format = kwargs.pop('format', None) -        # We include these simply for dependency injection in tests. -        # We can't add them as class attributes or they would expect an +        # We include this simply for dependency injection in tests. +        # We can't add it as a class attributes or it would expect an          # implicit `self` argument to be passed.          self.reverse = reverse -        self.resolve = resolve          super(HyperlinkedRelatedField, self).__init__(**kwargs) @@ -205,6 +204,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,11 +218,18 @@ class HyperlinkedRelatedField(RelatedField):                  data = '/' + data[len(prefix):]          try: -            match = self.resolve(data) +            match = resolve(data)          except Resolver404:              self.fail('no_match') -        if match.view_name != self.view_name: +        try: +            expected_viewname = request.versioning_scheme.get_versioned_viewname( +                self.view_name, request +            ) +        except AttributeError: +            expected_viewname = self.view_name + +        if match.view_name != expected_viewname:              self.fail('incorrect_match')          try: | 
