aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorGaurav Dadhania2014-09-09 05:42:52 +0530
committerGaurav Dadhania2014-09-09 05:42:52 +0530
commit1a885b9e16d49f4143a086dc99a6024286aef3e0 (patch)
treeaca89724ea98582dcb0f6d9bce4f461b3093d583 /rest_framework
parentd4d7739574e2f41dc288fc796a61efdb94cc39f2 (diff)
downloaddjango-rest-framework-1a885b9e16d49f4143a086dc99a6024286aef3e0.tar.bz2
Make sure APIRoot.get can take on args, kwargs so router can be embedded within any URL pattern.
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/routers.py4
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()