From 07cb610461c8139508dbbe7f8d06244124442823 Mon Sep 17 00:00:00 2001 From: David Henderson Date: Mon, 10 Dec 2012 18:46:05 +0000 Subject: [PATCH 1/3] Make the kwargs from the url available in the request --- rest_framework/request.py | 3 ++- rest_framework/views.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index 39c643219..a3ea5acd4 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -75,12 +75,13 @@ class Request(object): _CONTENTTYPE_PARAM = api_settings.FORM_CONTENTTYPE_OVERRIDE def __init__(self, request, parsers=None, authenticators=None, - negotiator=None, parser_context=None): + negotiator=None, parser_context=None, kargs = {}): self._request = request self.parsers = parsers or () self.authenticators = authenticators or () self.negotiator = negotiator or self._default_negotiator() self.parser_context = parser_context + self.kwargs = kargs self._data = Empty self._files = Empty self._method = Empty diff --git a/rest_framework/views.py b/rest_framework/views.py index 10bdd5a53..e987bc0f1 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -275,7 +275,7 @@ class APIView(View): parsers=self.get_parsers(), authenticators=self.get_authenticators(), negotiator=self.get_content_negotiator(), - parser_context=parser_context) + parser_context=parser_context, kargs=kargs) def initial(self, request, *args, **kwargs): """ From 54d9cd4dba6b207fc8debaba1eda4d330c22e693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Thu, 13 Dec 2012 16:44:45 +0100 Subject: [PATCH 2/3] fixed validationerror usage --- rest_framework/fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 75ce1b9f9..da588082c 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -581,7 +581,7 @@ class HyperlinkedRelatedField(RelatedField): except: pass - raise ValidationError('Could not resolve URL for field using view name "%s"', view_name) + raise ValidationError('Could not resolve URL for field using view name "%s"' % view_name) def from_native(self, value): # Convert URL -> model instance pk @@ -680,7 +680,7 @@ class HyperlinkedIdentityField(Field): except: pass - raise ValidationError('Could not resolve URL for field using view name "%s"', view_name) + raise ValidationError('Could not resolve URL for field using view name "%s"' % view_name) ##### Typed Fields ##### From 19da42822a72d4f6c65a46ff282c736a9ca8d4ea Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Thu, 13 Dec 2012 23:14:45 +0100 Subject: [PATCH 3/3] Update yaml envs to latest Django --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ccfdeacbf..0dc878373 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ python: env: - DJANGO=https://github.com/django/django/zipball/master - - DJANGO=django==1.4.1 --use-mirrors - - DJANGO=django==1.3.3 --use-mirrors + - DJANGO=django==1.4.3 --use-mirrors + - DJANGO=django==1.3.5 --use-mirrors install: - pip install $DJANGO