Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all request.REQUEST usages - replace with request.GET and/or

Browse Source 
request.POST to eliminate Django deprecation messages.
This commit is contained in:
John Eskew
2016-02-18 14:51:48 -05:00
parent 94d5b5dba3
commit df261cd5d6
12 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/djangoapps/instructor_task/tests/test_base.py
View File

@@ -176,7 +176,7 @@ class InstructorTaskCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase)
def get_task_status(task_id):
"""Use api method to fetch task status, using mock request."""
mock_request = Mock()
mock_request.REQUEST = {'task_id': task_id}
mock_request.GET = mock_request.POST = {'task_id': task_id}
response = instructor_task_status(mock_request)
status = json.loads(response.content)
return status

12
lms/djangoapps/instructor_task/tests/test_views.py
View File

@@ -7,7 +7,7 @@ from celery.states import SUCCESS, FAILURE, REVOKED, PENDING
from mock import Mock, patch
from django.utils.datastructures import MultiValueDict
from django.http import QueryDict
from instructor_task.models import PROGRESS
from instructor_task.tests.test_base import (InstructorTaskTestCase,
@@ -24,14 +24,14 @@ class InstructorTaskReportTest(InstructorTaskTestCase):
def _get_instructor_task_status(self, task_id):
"""Returns status corresponding to task_id via api method."""
request = Mock()
request.REQUEST = {'task_id': task_id}
request.GET = request.POST = {'task_id': task_id}
return instructor_task_status(request)
def test_instructor_task_status(self):
instructor_task = self._create_failure_entry()
task_id = instructor_task.task_id
request = Mock()
request.REQUEST = {'task_id': task_id}
request.GET = request.POST = {'task_id': task_id}
response = instructor_task_status(request)
output = json.loads(response.content)
self.assertEquals(output['task_id'], task_id)
@@ -39,7 +39,7 @@ class InstructorTaskReportTest(InstructorTaskTestCase):
def test_missing_instructor_task_status(self):
task_id = "missing_id"
request = Mock()
request.REQUEST = {'task_id': task_id}
request.GET = request.POST = {'task_id': task_id}
response = instructor_task_status(request)
output = json.loads(response.content)
self.assertEquals(output, {})
@@ -50,7 +50,9 @@ class InstructorTaskReportTest(InstructorTaskTestCase):
# list data, so the key value has "[]" appended to it.
task_ids = [(self._create_failure_entry()).task_id for _ in range(1, 5)]
request = Mock()
request.REQUEST = MultiValueDict({'task_ids[]': task_ids})
task_ids_query_dict = QueryDict(mutable=True)
task_ids_query_dict.update({'task_ids[]': task_ids})
request.GET = request.POST = task_ids_query_dict
response = instructor_task_status(request)
output = json.loads(response.content)
self.assertEquals(len(output), len(task_ids))

8
lms/djangoapps/instructor_task/views.py
View File

@@ -76,11 +76,11 @@ def instructor_task_status(request):
"""
output = {}
if 'task_id' in request.REQUEST:
task_id = request.REQUEST['task_id']
task_id = request.GET.get('task_id') or request.POST.get('task_id')
tasks = request.GET.get('task_ids[]') or request.POST.get('task_ids[]')
if task_id:
output = _get_instructor_task_status(task_id)
elif 'task_ids[]' in request.REQUEST:
tasks = request.REQUEST.getlist('task_ids[]')
elif tasks:
for task_id in tasks:
task_output = _get_instructor_task_status(task_id)
if task_output is not None: