From 67a0cccba9785395042e22d61c748b9f574c1212 Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Fri, 15 Mar 2013 11:08:09 -0400 Subject: [PATCH] Addressing some pep8/pylint concerns --- lms/djangoapps/instructor/views.py | 28 +++++++++++++--------------- lms/envs/common.py | 8 ++++---- lms/envs/dev.py | 2 +- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py index 91ea8793f1..e0a67bece8 100644 --- a/lms/djangoapps/instructor/views.py +++ b/lms/djangoapps/instructor/views.py @@ -1,8 +1,8 @@ -# ======== Instructor views ============================================================================= - +""" +Instructor Views +""" from collections import defaultdict import csv -import itertools import json import logging import os @@ -10,8 +10,6 @@ import re import requests from requests.status_codes import codes import urllib -import datetime -from datetime import datetime, timedelta from collections import OrderedDict import json @@ -595,7 +593,7 @@ def instructor_dashboard(request, course_id): #---------------------------------------- # analytics def get_analytics_result(analytics_name): - """Return data for an Analytic piece, or None if it doesn't exist. It + """Return data for an Analytic piece, or None if it doesn't exist. It logs and swallows errors. """ url = settings.ANALYTICS_SERVER_URL + \ @@ -621,14 +619,14 @@ def instructor_dashboard(request, course_id): if idash_mode == 'Analytics': DASHBOARD_ANALYTICS = [ - #"StudentsAttemptedProblems", # num students who tried given problem - "StudentsDailyActivity", # active students by day - "StudentsDropoffPerDay", # active students dropoff by day - #"OverallGradeDistribution", # overall point distribution for course - "StudentsActive", # num students active in time period (default = 1wk) - "StudentsEnrolled", # num students enrolled - #"StudentsPerProblemCorrect", # foreach problem, num students correct, - "ProblemGradeDistribution", # foreach problem, grade distribution + # "StudentsAttemptedProblems", # num students who tried given problem + "StudentsDailyActivity", # active students by day + "StudentsDropoffPerDay", # active students dropoff by day + # "OverallGradeDistribution", # overall point distribution for course + "StudentsActive", # num students active in time period (default = 1wk) + "StudentsEnrolled", # num students enrolled + # "StudentsPerProblemCorrect", # foreach problem, num students correct + "ProblemGradeDistribution", # foreach problem, grade distribution ] for analytic_name in DASHBOARD_ANALYTICS: analytics_results[analytic_name] = get_analytics_result(analytic_name) @@ -659,7 +657,7 @@ def instructor_dashboard(request, course_id): 'offline_grade_log': offline_grades_available(course_id), 'cohorts_ajax_url': reverse('cohorts', kwargs={'course_id': course_id}), - 'analytics_results' : analytics_results, + 'analytics_results': analytics_results, } return render_to_response('courseware/instructor_dashboard.html', context) diff --git a/lms/envs/common.py b/lms/envs/common.py index 2e33916233..cfd6fc34de 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -82,12 +82,12 @@ MITX_FEATURES = { 'AUTH_USE_OPENID_PROVIDER': False, # analytics experiments - 'ENABLE_INSTRUCTOR_ANALYTICS' : False, + 'ENABLE_INSTRUCTOR_ANALYTICS': False, # Flip to True when the YouTube iframe API breaks (again) 'USE_YOUTUBE_OBJECT_API': False, - # Give a UI to show a student's submission history in a problem by the + # Give a UI to show a student's submission history in a problem by the # Staff Debug tool. 'ENABLE_STUDENT_HISTORY_VIEW': True } @@ -213,8 +213,8 @@ WIKI_ENABLED = False ### COURSE_DEFAULT = '6.002x_Fall_2012' -COURSE_SETTINGS = {'6.002x_Fall_2012': {'number' : '6.002x', - 'title' : 'Circuits and Electronics', +COURSE_SETTINGS = {'6.002x_Fall_2012': {'number': '6.002x', + 'title': 'Circuits and Electronics', 'xmlpath': '6002x/', 'location': 'i4x://edx/6002xs12/course/6.002x_Fall_2012', } diff --git a/lms/envs/dev.py b/lms/envs/dev.py index f5b30c948b..898d9a5860 100644 --- a/lms/envs/dev.py +++ b/lms/envs/dev.py @@ -221,4 +221,4 @@ PEARSON_TEST_PASSWORD = "12345" ########################## ANALYTICS TESTING ######################## ANALYTICS_SERVER_URL = "http://127.0.0.1:9000/" -ANALYTICS_API_KEY = "" \ No newline at end of file +ANALYTICS_API_KEY = ""