From af9e4f69d732cc643d6ec7ae13d4a19ac0332d44 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 21 Feb 2012 20:12:14 +0000
Subject: Merging master into develop

---
 examples/pygments_api/views.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'examples/pygments_api')

diff --git a/examples/pygments_api/views.py b/examples/pygments_api/views.py
index 852b6730..bca3dac6 100644
--- a/examples/pygments_api/views.py
+++ b/examples/pygments_api/views.py
@@ -1,10 +1,10 @@
 from __future__ import with_statement  # for python 2.5
 from django.conf import settings
-from django.core.urlresolvers import reverse
 
 from djangorestframework.resources import FormResource
 from djangorestframework.response import Response
 from djangorestframework.renderers import BaseRenderer
+from djangorestframework.utils import reverse
 from djangorestframework.views import View
 from djangorestframework import status
 
@@ -61,7 +61,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 Response([reverse('pygments-instance', args=[unique_id]) for unique_id in unique_ids])
+        return Response([reverse('pygments-instance', request, args=[unique_id]) for unique_id in unique_ids])
 
     def post(self, request):
         """
@@ -81,8 +81,8 @@ class PygmentsRoot(View):
 
         remove_oldest_files(HIGHLIGHTED_CODE_DIR, MAX_FILES)
 
-        self.headers['Location'] = reverse('pygments-instance', args=[unique_id])
-        return Response(status=status.HTTP_201_CREATED)
+        location = reverse('pygments-instance', request, args=[unique_id])
+        return Response(status=status.HTTP_201_CREATED, headers={'Location': location})
 
 
 class PygmentsInstance(View):
@@ -98,7 +98,7 @@ class PygmentsInstance(View):
         """
         pathname = os.path.join(HIGHLIGHTED_CODE_DIR, unique_id)
         if not os.path.exists(pathname):
-            return Response(status.HTTP_404_NOT_FOUND)
+            return Response(status=status.HTTP_404_NOT_FOUND)
         return Response(open(pathname, 'r').read())
 
     def delete(self, request, unique_id):
@@ -107,6 +107,7 @@ class PygmentsInstance(View):
         """
         pathname = os.path.join(HIGHLIGHTED_CODE_DIR, unique_id)
         if not os.path.exists(pathname):
-            return Response(status.HTTP_404_NOT_FOUND)
-        return Response(os.remove(pathname))
+            return Response(status=status.HTTP_404_NOT_FOUND)
+        os.remove(pathname)
+        return Response()
 
-- 
cgit v1.2.3


From 5fd4c639d7c64572dd07dc31dcd627bed9469b05 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 21 Feb 2012 20:57:36 +0000
Subject: Merge master into develop

---
 examples/pygments_api/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/pygments_api')

diff --git a/examples/pygments_api/views.py b/examples/pygments_api/views.py
index bca3dac6..75d36fea 100644
--- a/examples/pygments_api/views.py
+++ b/examples/pygments_api/views.py
@@ -4,7 +4,7 @@ from django.conf import settings
 from djangorestframework.resources import FormResource
 from djangorestframework.response import Response
 from djangorestframework.renderers import BaseRenderer
-from djangorestframework.utils import reverse
+from djangorestframework.reverse import reverse
 from djangorestframework.views import View
 from djangorestframework import status
 
-- 
cgit v1.2.3