From d0e8965a3cd25a642f6b02d603987d1b18f1d0be Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Mon, 20 May 2013 16:42:27 -0400 Subject: [PATCH] Fix pep8/pylint issues --- .../grading_service_module.py | 10 ++++++---- lms/djangoapps/courseware/module_render.py | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py index b16f0618bb..3e3f943cd7 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py @@ -53,8 +53,9 @@ class GradingService(object): except (RequestException, ConnectionError, HTTPError) as err: # reraise as promised GradingServiceError, but preserve stacktrace. #This is a dev_facing_error - log.error("Problem posting data to the grading controller. URL: {0}, data: {1}".format(url, data)) - raise GradingServiceError, str(err), sys.exc_info()[2] + error_string = "Problem posting data to the grading controller. URL: {0}, data: {1}".format(url, data) + log.error(error_string) + raise GradingServiceError(error_string) return r.text @@ -71,8 +72,9 @@ class GradingService(object): except (RequestException, ConnectionError, HTTPError) as err: # reraise as promised GradingServiceError, but preserve stacktrace. #This is a dev_facing_error - log.error("Problem getting data from the grading controller. URL: {0}, params: {1}".format(url, params)) - raise GradingServiceError, str(err), sys.exc_info()[2] + error_string = "Problem getting data from the grading controller. URL: {0}, params: {1}".format(url, params) + log.error(error_string) + raise GradingServiceError(error_string) return r.text diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py index cd70ce6d00..c866ad7d13 100644 --- a/lms/djangoapps/courseware/module_render.py +++ b/lms/djangoapps/courseware/module_render.py @@ -231,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):