diff options
| author | Xavier Ordoquy | 2014-09-09 07:19:16 +0200 | 
|---|---|---|
| committer | Xavier Ordoquy | 2014-09-09 07:19:16 +0200 | 
| commit | 015a8122c7738dd8913939b42d3f0ec932d88711 (patch) | |
| tree | cc1781e1a3ae5fd9ebdf9e19730ca603ec79f3ad /rest_framework | |
| parent | 168710813cf9c313db41bac26b4e1481602efdb7 (diff) | |
| parent | 1a885b9e16d49f4143a086dc99a6024286aef3e0 (diff) | |
| download | django-rest-framework-015a8122c7738dd8913939b42d3f0ec932d88711.tar.bz2 | |
Merge pull request #1852 from GVRV/bugfix/apiroot_get_regression
Make sure APIRoot.get can take on args, kwargs so router can be embedded...
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/routers.py | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/rest_framework/routers.py b/rest_framework/routers.py index ae56673d..8f1ab6fa 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -284,10 +284,10 @@ class DefaultRouter(SimpleRouter):          class APIRoot(views.APIView):              _ignore_model_permissions = True -            def get(self, request, format=None): +            def get(self, request, *args, **kwargs):                  ret = {}                  for key, url_name in api_root_dict.items(): -                    ret[key] = reverse(url_name, request=request, format=format) +                    ret[key] = reverse(url_name, request=request, format=kwargs.get('format', None))                  return Response(ret)          return APIRoot.as_view() | 
