aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorTom Christie2012-08-24 16:06:23 +0100
committerTom Christie2012-08-24 16:06:23 +0100
commit7557777c668e6b8eaa85b07971b94115a33c9358 (patch)
tree6bd152248eb1e535b86fbc4396fe16fa644a0d2f /examples
parent2d2e2f95b0268c3282edfca5c047bdc831133016 (diff)
parentdb7d15d5d136a9b4dcf759f9d588006244bd4e91 (diff)
downloaddjango-rest-framework-7557777c668e6b8eaa85b07971b94115a33c9358.tar.bz2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'examples')
-rw-r--r--examples/permissionsexample/views.py4
-rw-r--r--examples/pygments_api/views.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/permissionsexample/views.py b/examples/permissionsexample/views.py
index b0c1f02e..5aeae7eb 100644
--- a/examples/permissionsexample/views.py
+++ b/examples/permissionsexample/views.py
@@ -12,11 +12,11 @@ class PermissionsExampleView(View):
return [
{
'name': 'Throttling Example',
- 'url': reverse('throttled-resource', request)
+ 'url': reverse('throttled-resource', request=request)
},
{
'name': 'Logged in example',
- 'url': reverse('loggedin-resource', request)
+ 'url': reverse('loggedin-resource', request=request)
},
]
diff --git a/examples/pygments_api/views.py b/examples/pygments_api/views.py
index 3dd55115..f41fa739 100644
--- a/examples/pygments_api/views.py
+++ b/examples/pygments_api/views.py
@@ -65,7 +65,7 @@ class PygmentsRoot(View):
Return a list of all currently existing snippets.
"""
unique_ids = [os.path.split(f)[1] for f in list_dir_sorted_by_ctime(HIGHLIGHTED_CODE_DIR)]
- return [reverse('pygments-instance', request, args=[unique_id]) for unique_id in unique_ids]
+ return [reverse('pygments-instance', request=request, args=[unique_id]) for unique_id in unique_ids]
def post(self, request):
"""
@@ -85,7 +85,7 @@ class PygmentsRoot(View):
remove_oldest_files(HIGHLIGHTED_CODE_DIR, MAX_FILES)
- return Response(status.HTTP_201_CREATED, headers={'Location': reverse('pygments-instance', request, args=[unique_id])})
+ return Response(status.HTTP_201_CREATED, headers={'Location': reverse('pygments-instance', request=request, args=[unique_id])})
class PygmentsInstance(View):