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

Merge pull request #2058 from edx/waheed/ora195-json-serialization-error-fix

Browse Source 
JSON serialization error fixed.
This commit is contained in:
Waheed Ahmed
2014-01-15 08:18:27 -08:00
parent 7e02951571 b98f4e0229
commit a41ca43f4e
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
View File

@@ -651,7 +651,7 @@ class CombinedOpenEndedV1Module():
last_post_evaluation = task.format_feedback_with_evaluation(self.system, last_post_assessment)
last_post_assessment = last_post_evaluation
try:
rubric_data = task._parse_score_msg(task.child_history[-1].get('post_assessment', ""), self.system)
rubric_data = task._parse_score_msg(task.child_history[-1].get('post_assessment', "{}"), self.system)
except Exception:
log.debug("Could not parse rubric data from child history. "
"Likely we have not yet initialized a previous step, so this is perfectly fine.")

7
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
View File

@@ -503,6 +503,9 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
fail['feedback'] = error_message
return fail
if not score_result:
return fail
for tag in ['score', 'feedback', 'grader_type', 'success', 'grader_id', 'submission_id']:
if tag not in score_result:
# This is a dev_facing_error
@@ -586,7 +589,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
return ""
feedback_dict = self._parse_score_msg(
self.child_history[-1].get('post_assessment', ""),
self.child_history[-1].get('post_assessment', "{}"),
system,
join_feedback=join_feedback
)
@@ -756,7 +759,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
"""
attempt = self.child_history[index]
score = attempt.get('score')
post_assessment_data = self._parse_score_msg(attempt.get('post_assessment'), self.system)
post_assessment_data = self._parse_score_msg(attempt.get('post_assessment', "{}"), self.system)
grader_types = post_assessment_data.get('grader_types')
# According to _parse_score_msg in ML grading there should be only one grader type.

8
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
View File

@@ -390,6 +390,14 @@ class OpenEndedModuleTest(unittest.TestCase):
# Confirm that the answer is stored properly.
self.assertEqual(test_module.latest_answer(), submitted_response)
def test_parse_score_msg(self):
"""
Test _parse_score_msg with empty dict.
"""
assessment = self.openendedmodule._parse_score_msg("{}", self.test_system)
self.assertEqual(assessment.get("valid"), False)
class CombinedOpenEndedModuleTest(unittest.TestCase):
"""