merged + fixed broken test

1 files changed, 4 insertions, 4 deletions

diff --git a/examples/objectstore/views.py b/examples/objectstore/views.py
index ae545394..b48bfac2 100644
--- a/examples/objectstore/views.py
+++ b/examples/objectstore/views.py
@@ -1,6 +1,6 @@
 from django.conf import settings
-from django.core.urlresolvers import reverse
 
+from djangorestframework.reverse import reverse
 from djangorestframework.views import View
 from djangorestframework.response import Response
 from djangorestframework import status
@@ -41,7 +41,7 @@ class ObjectStoreRoot(View):
         filepaths = [os.path.join(OBJECT_STORE_DIR, file) for file in os.listdir(OBJECT_STORE_DIR) if not file.startswith('.')]
         ctime_sorted_basenames = [item[0] for item in sorted([(os.path.basename(path), os.path.getctime(path)) for path in filepaths],
                                                              key=operator.itemgetter(1), reverse=True)]
-        return Response([reverse('stored-object', kwargs={'key':key}) for key in ctime_sorted_basenames])
+        return Response([reverse('stored-object', request, kwargs={'key':key}) for key in ctime_sorted_basenames])
 
     def post(self, request):
         """
@@ -51,8 +51,8 @@ class ObjectStoreRoot(View):
         pathname = os.path.join(OBJECT_STORE_DIR, key)
         pickle.dump(self.CONTENT, open(pathname, 'wb'))
         remove_oldest_files(OBJECT_STORE_DIR, MAX_FILES)
-        self.headers['Location'] = reverse('stored-object', kwargs={'key':key})
-        return Response(self.CONTENT, status=status.HTTP_201_CREATED)
+        url = reverse('stored-object', request, kwargs={'key':key})
+        return Response(self.CONTENT, status.HTTP_201_CREATED, {'Location': url})
 
 
 class StoredObject(View):