From a06226aad65713004b7d751fa6d6d7d95e9c7b71 Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Thu, 29 Aug 2013 16:34:17 -0400 Subject: [PATCH] Address review comments --- .../combined_open_ended_modulev1.py | 10 ++-------- .../xmodule/xmodule/tests/test_combined_open_ended.py | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py index becb0fd170..63c58135dc 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py @@ -906,17 +906,11 @@ class CombinedOpenEndedV1Module(): """ d = self.get_score() - score = d['score'] - total = d['total'] - if total > 0 and self.is_scored: - if self.weight is not None: - # scale score and total by weight/total: - score = score * self.get_weight() / total - total = self.get_weight() + if d['total'] > 0 and self.is_scored: try: - return Progress(score, total) + return Progress(d['score'], d['total']) except (TypeError, ValueError): log.exception("Got bad progress") return None diff --git a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py index d97d62d7d3..8a32f7e822 100644 --- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py +++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py @@ -498,10 +498,10 @@ class CombinedOpenEndedModuleTest(unittest.TestCase): progress = self.combinedoe.get_progress() self.assertIsInstance(progress, Progress) - #progress._a is the score of the xmodule, which is 0 right now + # progress._a is the score of the xmodule, which is 0 right now. self.assertEqual(progress._a, 0) - #progress._b is the max_score (which is 1), divided by the weight (which is 1) + # progress._b is the max_score (which is 1), divided by the weight (which is 1). self.assertEqual(progress._b, 1) def test_container_weight(self):