patchwork/views: request.REQUEST is deprecated in django 1.8

.. so do explicit accesses to request.GET or request.POST.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/patchwork/requestcontext.py b/patchwork/requestcontext.py
index 3b1afaf6c849ce5025979f903478aae287c69cf9..342d3803f0b9e6dc5750dd4d81c2523d87e93dfb 100644 (file)
--- a/patchwork/requestcontext.py
+++ b/patchwork/requestcontext.py
@@ -56,7 +56,13 @@ class PatchworkRequestContext(RequestContext):
         if list_view:
             params = self.filters.params()
             for param in ['order', 'page']:
-                value = request.REQUEST.get(param, None)
+                data = {}
+                if request.method == 'GET':
+                    data = request.GET
+                elif request.method == 'POST':
+                    data = request.POST
+
+                value = data.get(param, None)
                 if value:
                         params.append((param, value))
             self.update({

diff --git a/patchwork/views/__init__.py b/patchwork/views/__init__.py
index cb05a8ec7dc9e0ea619b9952eaf99744f8ea2d43..b64f6041eca006bb800f190c0b2183f5e9b3c3ac 100644 (file)
--- a/patchwork/views/__init__.py
+++ b/patchwork/views/__init__.py
@@ -50,15 +50,19 @@ def generic_list(request, project, view,
             list_view_params = view_args)
 
     context.project = project
-    order = Order(request.REQUEST.get('order'), editable = editable_order)
+    data = {}
+    if request.method == 'GET':
+        data = request.GET
+    elif request.method == 'POST':
+        data = request.POST
+    order = Order(data.get('order'), editable=editable_order)
 
     # Explicitly set data to None because request.POST will be an empty dict
     # when the form is not submitted, but passing a non-None data argument to
     # a forms.Form will make it bound and we don't want that to happen unless
     # there's been a form submission.
-    data = None
-    if request.method == 'POST':
-        data = request.POST
+    if request.method != 'POST':
+        data = None
     user = request.user
     properties_form = None
     if project.is_editable(user):