From 16e1ecf6861142c8dbf59b6715c27caf7b751acd Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Mon, 20 May 2013 12:46:12 -0400 Subject: [PATCH] fix some pylint violations --- .../xmodule/xmodule/tests/test_combined_open_ended.py | 6 +++--- lms/djangoapps/courseware/module_render.py | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) 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 917e90e575..409347882f 100644 --- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py +++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py @@ -407,7 +407,7 @@ class CombinedOpenEndedModuleTest(unittest.TestCase): self.assertTrue(changed) def test_get_max_score(self): - changed = self.combinedoe.update_task_states() + self.combinedoe.update_task_states() self.combinedoe.state = "done" self.combinedoe.is_scored = True max_score = self.combinedoe.max_score() @@ -611,11 +611,11 @@ class OpenEndedModuleXmlTest(unittest.TestCase, DummyModulestore): self.assertEqual(module.current_task_number, 1) #Get html and other data client will request - html = module.get_html() + module.get_html() legend = module.handle_ajax("get_legend", {}) self.assertTrue(isinstance(legend, basestring)) - status = module.handle_ajax("get_status", {}) + module.handle_ajax("get_status", {}) module.handle_ajax("skip_post_assessment", {}) self.assertTrue(isinstance(legend, basestring)) diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py index 657839a94b..1b3bb91dda 100644 --- a/lms/djangoapps/courseware/module_render.py +++ b/lms/djangoapps/courseware/module_render.py @@ -214,12 +214,11 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours #This is a hacky way to pass settings to the combined open ended xmodule #It needs an S3 interface to upload images to S3 #It needs the open ended grading interface in order to get peer grading to be done - #TODO: refactor these settings into module-specific settings when possible. #this first checks to see if the descriptor is the correct one, and only sends settings if it is #Get descriptor metadata fields indicating needs for various settings needs_open_ended_interface = hasattr(descriptor, "needs_open_ended_interface") and descriptor.needs_open_ended_interface - needs_s3_interface = hasattr(descriptor, "needs_s3_interface") and descriptor.needs_s3_interface + needs_s3_interface = hasattr(descriptor, "needs_s3_interface") and descriptor.needs_s3_interface #Initialize interfaces to None open_ended_grading_interface = None @@ -232,9 +231,9 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours open_ended_grading_interface['mock_staff_grading'] = settings.MOCK_STAFF_GRADING if needs_s3_interface: s3_interface = { - 'access_key' : getattr(settings,'AWS_ACCESS_KEY_ID',''), - 'secret_access_key' : getattr(settings,'AWS_SECRET_ACCESS_KEY',''), - 'storage_bucket_name' : getattr(settings,'AWS_STORAGE_BUCKET_NAME','openended') + 'access_key' : getattr(settings,'AWS_ACCESS_KEY_ID', ''), + 'secret_access_key' : getattr(settings,'AWS_SECRET_ACCESS_KEY', ''), + 'storage_bucket_name' : getattr(settings,'AWS_STORAGE_BUCKET_NAME', 'openended') } def inner_get_module(descriptor):