Merge branch 'master' into feature/diana/close-oe-problems

Conflicts:
	common/lib/xmodule/xmodule/peer_grading_module.py

.pep8

+[pep8]
+ignore=E501
\ No newline at end of file

cms/__init__.py

-

cms/djangoapps/auth/authz.py

@@ -18,6 +18,8 @@ STAFF_ROLE_NAME = 'staff'
 # we're just making a Django group for each location/role combo
 # to do this we're just creating a Group name which is a formatted string
 # of those two variables
+
+
 def get_course_groupname_for_role(location, role):
     loc = Location(location)
     # hack: check for existence of a group name in the legacy LMS format <role>_<course>
@@ -25,11 +27,12 @@ def get_course_groupname_for_role(location, role):
     # more information
     groupname = '{0}_{1}'.format(role, loc.course)
 
-    if len(Group.objects.filter(name = groupname)) == 0:
-        groupname = '{0}_{1}'.format(role,loc.course_id)
+    if len(Group.objects.filter(name=groupname)) == 0:
+        groupname = '{0}_{1}'.format(role, loc.course_id)
 
     return groupname
 
+
 def get_users_in_course_group_by_role(location, role):
     groupname = get_course_groupname_for_role(location, role)
     (group, created) = Group.objects.get_or_create(name=groupname)
@@ -39,6 +42,8 @@ def get_users_in_course_group_by_role(location, role):
 '''
 Create all permission groups for a new course and subscribe the caller into those roles
 '''
+
+
 def create_all_course_groups(creator, location):
     create_new_course_group(creator, location, INSTRUCTOR_ROLE_NAME)
     create_new_course_group(creator, location, STAFF_ROLE_NAME)
@@ -46,7 +51,7 @@ def create_all_course_groups(creator, location):
 
 def create_new_course_group(creator, location, role):
     groupname = get_course_groupname_for_role(location, role)
-    (group, created) =Group.objects.get_or_create(name=groupname)
+    (group, created) = Group.objects.get_or_create(name=groupname)
     if created:
         group.save()
 
@@ -59,6 +64,8 @@ def create_new_course_group(creator, location, role):
 This is to be called only by either a command line code path or through a app which has already
 asserted permissions
 '''
+
+
 def _delete_course_group(location):
     # remove all memberships
     instructors = Group.objects.get(name=get_course_groupname_for_role(location, INSTRUCTOR_ROLE_NAME))
@@ -75,6 +82,8 @@ def _delete_course_group(location):
 This is to be called only by either a command line code path or through an app which has already
 asserted permissions to do this action
 '''
+
+
 def _copy_course_group(source, dest):
     instructors = Group.objects.get(name=get_course_groupname_for_role(source, INSTRUCTOR_ROLE_NAME))
     new_instructors_group = Group.objects.get(name=get_course_groupname_for_role(dest, INSTRUCTOR_ROLE_NAME))
@@ -133,8 +142,6 @@ def remove_user_from_course_group(caller, user, location, role):
 def is_user_in_course_group_role(user, location, role):
     if user.is_active and user.is_authenticated:
         # all "is_staff" flagged accounts belong to all groups
-        return user.is_staff or user.groups.filter(name=get_course_groupname_for_role(location,role)).count() > 0
+        return user.is_staff or user.groups.filter(name=get_course_groupname_for_role(location, role)).count() > 0
 
     return False
-
-    

cms/djangoapps/contentstore/course_info_model.py

@@ -8,6 +8,8 @@ import logging
 
 ## TODO store as array of { date, content } and override  course_info_module.definition_from_xml
 ## This should be in a class which inherits from XmlDescriptor
+
+
 def get_course_updates(location):
     """
     Retrieve the relevant course_info updates and unpack into the model which the client expects:
@@ -42,12 +44,13 @@ def get_course_updates(location):
                 content = "\n".join([html.tostring(ele) for ele in update[1:]])
 
             # make the id on the client be 1..len w/ 1 being the oldest and len being the newest
-            course_upd_collection.append({"id" : location_base + "/" + str(len(course_html_parsed) - idx),
-                                          "date" : update.findtext("h2"),
-                                          "content" : content})
+            course_upd_collection.append({"id": location_base + "/" + str(len(course_html_parsed) - idx),
+                                          "date": update.findtext("h2"),
+                                          "content": content})
 
     return course_upd_collection
 
+
 def update_course_updates(location, update, passed_id=None):
     """
     Either add or update the given course update. It will add it if the passed_id is absent or None. It will update it if
@@ -85,9 +88,10 @@ def update_course_updates(location, update, passed_id=None):
         course_updates.definition['data'] = html.tostring(course_html_parsed)
         modulestore('direct').update_item(location, course_updates.definition['data'])
 
-        return {"id" : passed_id,
-                "date" : update['date'],
-                "content" :update['content']}
+        return {"id": passed_id,
+                "date": update['date'],
+                "content": update['content']}
+
 
 def delete_course_update(location, update, passed_id):
     """
@@ -124,6 +128,7 @@ def delete_course_update(location, update, passed_id):
 
     return get_course_updates(location)
 
+
 def get_idx(passed_id):
     """
     From the url w/ idx appended, get the idx.

cms/djangoapps/contentstore/features/common.py

@@ -12,6 +12,8 @@ from logging import getLogger
 logger = getLogger(__name__)
 
 ###########  STEP HELPERS ##############
+
+
 @step('I (?:visit|access|open) the Studio homepage$')
 def i_visit_the_studio_homepage(step):
     # To make this go to port 8001, put
@@ -20,25 +22,30 @@ def i_visit_the_studio_homepage(step):
     world.browser.visit(django_url('/'))
     assert world.browser.is_element_present_by_css('body.no-header', 10)
 
+
 @step('I am logged into Studio$')
 def i_am_logged_into_studio(step):
     log_into_studio()
 
+
 @step('I confirm the alert$')
 def i_confirm_with_ok(step):
     world.browser.get_alert().accept()
 
+
 @step(u'I press the "([^"]*)" delete icon$')
 def i_press_the_category_delete_icon(step, category):
     if category == 'section':
         css = 'a.delete-button.delete-section-button span.delete-icon'
     elif category == 'subsection':
-        css='a.delete-button.delete-subsection-button  span.delete-icon'
+        css = 'a.delete-button.delete-subsection-button  span.delete-icon'
     else:
         assert False, 'Invalid category: %s' % category
     css_click(css)
 
 ####### HELPER FUNCTIONS ##############
+
+
 def create_studio_user(
         uname='robot',
         email='robot+studio@edx.org',
@@ -58,6 +65,7 @@ def create_studio_user(
 
     user_profile = UserProfileFactory(user=studio_user)
 
+
 def flush_xmodule_store():
     # Flush and initialize the module store
     # It needs the templates because it creates new records
@@ -70,26 +78,32 @@ def flush_xmodule_store():
     xmodule.modulestore.django.modulestore().collection.drop()
     xmodule.templates.update_templates()
 
-def assert_css_with_text(css,text):
+
+def assert_css_with_text(css, text):
     assert_true(world.browser.is_element_present_by_css(css, 5))
     assert_equal(world.browser.find_by_css(css).text, text)
 
+
 def css_click(css):
     world.browser.find_by_css(css).first.click()
 
+
 def css_fill(css, value):
     world.browser.find_by_css(css).first.fill(value)
 
+
 def clear_courses():
     flush_xmodule_store()
 
+
 def fill_in_course_info(
         name='Robot Super Course',
         org='MITx',
         num='101'):
-    css_fill('.new-course-name',name)
-    css_fill('.new-course-org',org)
-    css_fill('.new-course-number',num)
+    css_fill('.new-course-name', name)
+    css_fill('.new-course-org', org)
+    css_fill('.new-course-number', num)
+
 
 def log_into_studio(
         uname='robot',
@@ -108,20 +122,23 @@ def log_into_studio(
 
     assert_true(world.browser.is_element_present_by_css('.new-course-button', 5))
 
+
 def create_a_course():
     css_click('a.new-course-button')
     fill_in_course_info()
     css_click('input.new-course-save')
     assert_true(world.browser.is_element_present_by_css('a#courseware-tab', 5))
 
+
 def add_section(name='My Section'):
     link_css = 'a.new-courseware-section-button'
     css_click(link_css)
     name_css = '.new-section-name'
     save_css = '.new-section-name-save'
-    css_fill(name_css,name)
+    css_fill(name_css, name)
     css_click(save_css)
 
+
 def add_subsection(name='Subsection One'):
     css = 'a.new-subsection-item'
     css_click(css)

cms/djangoapps/contentstore/features/courses.py

@@ -2,49 +2,61 @@ from lettuce import world, step
 from common import *
 
 ############### ACTIONS ####################
+
+
 @step('There are no courses$')
 def no_courses(step):
     clear_courses()
 
+
 @step('I click the New Course button$')
 def i_click_new_course(step):
     css_click('.new-course-button')
 
+
 @step('I fill in the new course information$')
 def i_fill_in_a_new_course_information(step):
     fill_in_course_info()
 
+
 @step('I create a new course$')
 def i_create_a_course(step):
     create_a_course()
 
+
 @step('I click the course link in My Courses$')
 def i_click_the_course_link_in_my_courses(step):
     course_css = 'span.class-name'
     css_click(course_css)
 
 ############ ASSERTIONS ###################
+
+
 @step('the Courseware page has loaded in Studio$')
 def courseware_page_has_loaded_in_studio(step):
     courseware_css = 'a#courseware-tab'
     assert world.browser.is_element_present_by_css(courseware_css)
 
+
 @step('I see the course listed in My Courses$')
 def i_see_the_course_in_my_courses(step):
     course_css = 'span.class-name'
-    assert_css_with_text(course_css,'Robot Super Course')
+    assert_css_with_text(course_css, 'Robot Super Course')
+
 
 @step('the course is loaded$')
 def course_is_loaded(step):
     class_css = 'a.class-name'
-    assert_css_with_text(class_css,'Robot Super Course')
+    assert_css_with_text(class_css, 'Robot Super Course')
+
 
 @step('I am on the "([^"]*)" tab$')
 def i_am_on_tab(step, tab_name):
     header_css = 'div.inner-wrapper h1'
-    assert_css_with_text(header_css,tab_name)
+    assert_css_with_text(header_css, tab_name)
+
 
 @step('I see a link for adding a new section$')
 def i_see_new_section_link(step):
     link_css = 'a.new-courseware-section-button'
-    assert_css_with_text(link_css,'New Section')
+    assert_css_with_text(link_css, 'New Section')

cms/djangoapps/contentstore/features/factories.py

@@ -3,6 +3,7 @@ from student.models import User, UserProfile, Registration
 from datetime import datetime
 import uuid
 
+
 class UserProfileFactory(factory.Factory):
     FACTORY_FOR = UserProfile
 
@@ -10,12 +11,14 @@ class UserProfileFactory(factory.Factory):
     name = 'Robot Studio'
     courseware = 'course.xml'
 
+
 class RegistrationFactory(factory.Factory):
     FACTORY_FOR = Registration
 
     user = None
     activation_key = uuid.uuid4().hex
 
+
 class UserFactory(factory.Factory):
     FACTORY_FOR = User
 

cms/djangoapps/contentstore/features/section.py

@@ -2,54 +2,65 @@ from lettuce import world, step
 from common import *
 
 ############### ACTIONS ####################
+
+
 @step('I have opened a new course in Studio$')
 def i_have_opened_a_new_course(step):
     clear_courses()
     log_into_studio()
     create_a_course()
 
+
 @step('I click the new section link$')
 def i_click_new_section_link(step):
     link_css = 'a.new-courseware-section-button'
     css_click(link_css)
 
+
 @step('I enter the section name and click save$')
 def i_save_section_name(step):
     name_css = '.new-section-name'
     save_css = '.new-section-name-save'
-    css_fill(name_css,'My Section')
+    css_fill(name_css, 'My Section')
     css_click(save_css)
 
+
 @step('I have added a new section$')
 def i_have_added_new_section(step):
     add_section()
 
+
 @step('I click the Edit link for the release date$')
 def i_click_the_edit_link_for_the_release_date(step):
     button_css = 'div.section-published-date a.edit-button'
     css_click(button_css)
 
+
 @step('I save a new section release date$')
 def i_save_a_new_section_release_date(step):
     date_css = 'input.start-date.date.hasDatepicker'
     time_css = 'input.start-time.time.ui-timepicker-input'
-    css_fill(date_css,'12/25/2013')
+    css_fill(date_css, '12/25/2013')
     # click here to make the calendar go away
     css_click(time_css)
-    css_fill(time_css,'12:00am')
+    css_fill(time_css, '12:00am')
     css_click('a.save-button')
 
 ############ ASSERTIONS ###################
+
+
 @step('I see my section on the Courseware page$')
 def i_see_my_section_on_the_courseware_page(step):
     section_css = 'span.section-name-span'
-    assert_css_with_text(section_css,'My Section')
+    assert_css_with_text(section_css, 'My Section')
+
 
 @step('the section does not exist$')
 def section_does_not_exist(step):
     css = 'span.section-name-span'
     assert world.browser.is_element_not_present_by_css(css)
 
+
 @step('I see a release date for my section$')
 def i_see_a_release_date_for_my_section(step):
     import re
@@ -63,18 +74,21 @@ def i_see_a_release_date_for_my_section(step):
     date_regex = '[01][0-9]\/[0-3][0-9]\/[12][0-9][0-9][0-9]'
     time_regex = '[0-2][0-9]:[0-5][0-9]'
     match_string = '%s %s at %s' % (msg, date_regex, time_regex)
-    assert re.match(match_string,status_text)
+    assert re.match(match_string, status_text)
+
 
 @step('I see a link to create a new subsection$')
 def i_see_a_link_to_create_a_new_subsection(step):
     css = 'a.new-subsection-item'
     assert world.browser.is_element_present_by_css(css)
 
+
 @step('the section release date picker is not visible$')
 def the_section_release_date_picker_not_visible(step):
     css = 'div.edit-subsection-publish-settings'
     assert False, world.browser.find_by_css(css).visible
 
+
 @step('the section release date is updated$')
 def the_section_release_date_is_updated(step):
     css = 'span.published-status'

cms/djangoapps/contentstore/features/signup.py

 from lettuce import world, step
 
+
 @step('I fill in the registration form$')
 def i_fill_in_the_registration_form(step):
     register_form = world.browser.find_by_css('form#register_form')
@@ -9,15 +10,18 @@ def i_fill_in_the_registration_form(step):
     register_form.find_by_name('name').fill('Robot Studio')
     register_form.find_by_name('terms_of_service').check()
 
+
 @step('I press the "([^"]*)" button on the registration form$')
 def i_press_the_button_on_the_registration_form(step, button):
     register_form = world.browser.find_by_css('form#register_form')
     register_form.find_by_value(button).click()
 
+
 @step('I should see be on the studio home page$')
 def i_should_see_be_on_the_studio_home_page(step):
     assert world.browser.find_by_css('div.inner-wrapper')
 
+
 @step(u'I should see the message "([^"]*)"$')
 def i_should_see_the_message(step, msg):
     assert world.browser.is_text_present(msg, 5)

cms/djangoapps/contentstore/features/studio-overview-togglesection.py

@@ -6,11 +6,13 @@ from nose.tools import assert_true, assert_false, assert_equal
 from logging import getLogger
 logger = getLogger(__name__)
 
+
 @step(u'I have a course with no sections$')
 def have_a_course(step):
     clear_courses()
     course = CourseFactory.create()
 
+
 @step(u'I have a course with 1 section$')
 def have_a_course_with_1_section(step):
     clear_courses()
@@ -18,8 +20,9 @@ def have_a_course_with_1_section(step):
     section = ItemFactory.create(parent_location=course.location)
     subsection1 = ItemFactory.create(
         parent_location=section.location,
-        template = 'i4x://edx/templates/sequential/Empty',
-        display_name = 'Subsection One',)
+        template='i4x://edx/templates/sequential/Empty',
+        display_name='Subsection One',)
+
 
 @step(u'I have a course with multiple sections$')
 def have_a_course_with_two_sections(step):
@@ -28,19 +31,20 @@ def have_a_course_with_two_sections(step):
     section = ItemFactory.create(parent_location=course.location)
     subsection1 = ItemFactory.create(
         parent_location=section.location,
-        template = 'i4x://edx/templates/sequential/Empty',
-        display_name = 'Subsection One',)
+        template='i4x://edx/templates/sequential/Empty',
+        display_name='Subsection One',)
     section2 = ItemFactory.create(
         parent_location=course.location,
         display_name='Section Two',)
     subsection2 = ItemFactory.create(
         parent_location=section2.location,
-        template = 'i4x://edx/templates/sequential/Empty',
-        display_name = 'Subsection Alpha',)
+        template='i4x://edx/templates/sequential/Empty',
+        display_name='Subsection Alpha',)
     subsection3 = ItemFactory.create(
         parent_location=section2.location,
-        template = 'i4x://edx/templates/sequential/Empty',
-        display_name = 'Subsection Beta',)
+        template='i4x://edx/templates/sequential/Empty',
+        display_name='Subsection Beta',)
+
 
 @step(u'I navigate to the course overview page$')
 def navigate_to_the_course_overview_page(step):
@@ -48,15 +52,18 @@ def navigate_to_the_course_overview_page(step):
     course_locator = '.class-name'
     css_click(course_locator)
 
+
 @step(u'I navigate to the courseware page of a course with multiple sections')
 def nav_to_the_courseware_page_of_a_course_with_multiple_sections(step):
     step.given('I have a course with multiple sections')
     step.given('I navigate to the course overview page')
 
+
 @step(u'I add a section')
 def i_add_a_section(step):
     add_section(name='My New Section That I Just Added')
 
+
 @step(u'I click the "([^"]*)" link$')
 def i_click_the_text_span(step, text):
     span_locator = '.toggle-button-sections span'
@@ -65,16 +72,19 @@ def i_click_the_text_span(step, text):
     assert_equal(world.browser.find_by_css(span_locator).value, text)
     css_click(span_locator)
 
+
 @step(u'I collapse the first section$')
 def i_collapse_a_section(step):
     collapse_locator = 'section.courseware-section a.collapse'
     css_click(collapse_locator)
 
+
 @step(u'I expand the first section$')
 def i_expand_a_section(step):
     expand_locator = 'section.courseware-section a.expand'
     css_click(expand_locator)
 
+
 @step(u'I see the "([^"]*)" link$')
 def i_see_the_span_with_text(step, text):
     span_locator = '.toggle-button-sections span'
@@ -82,6 +92,7 @@ def i_see_the_span_with_text(step, text):
     assert_equal(world.browser.find_by_css(span_locator).value, text)
     assert_true(world.browser.find_by_css(span_locator).visible)
 
+
 @step(u'I do not see the "([^"]*)" link$')
 def i_do_not_see_the_span_with_text(step, text):
     # Note that the span will exist on the page but not be visible
@@ -89,6 +100,7 @@ def i_do_not_see_the_span_with_text(step, text):
     assert_true(world.browser.is_element_present_by_css(span_locator))
     assert_false(world.browser.find_by_css(span_locator).visible)
 
+
 @step(u'all sections are expanded$')
 def all_sections_are_expanded(step):
     subsection_locator = 'div.subsection-list'
@@ -96,6 +108,7 @@ def all_sections_are_expanded(step):
     for s in subsections:
         assert_true(s.visible)
 
+
 @step(u'all sections are collapsed$')
 def all_sections_are_expanded(step):
     subsection_locator = 'div.subsection-list'

cms/djangoapps/contentstore/features/subsection.py

@@ -2,6 +2,8 @@ from lettuce import world, step
 from common import *
 
 ############### ACTIONS ####################
+
+
 @step('I have opened a new course section in Studio$')
 def i_have_opened_a_new_course_section(step):
     clear_courses()
@@ -9,29 +11,35 @@ def i_have_opened_a_new_course_section(step):
     create_a_course()
     add_section()
 
+
 @step('I click the New Subsection link')
 def i_click_the_new_subsection_link(step):
     css = 'a.new-subsection-item'
     css_click(css)
 
+
 @step('I enter the subsection name and click save$')
 def i_save_subsection_name(step):
     name_css = 'input.new-subsection-name-input'
     save_css = 'input.new-subsection-name-save'
-    css_fill(name_css,'Subsection One')
+    css_fill(name_css, 'Subsection One')
     css_click(save_css)
 
+
 @step('I have added a new subsection$')
 def i_have_added_a_new_subsection(step):
     add_subsection()
 
 ############ ASSERTIONS ###################
+
+
 @step('I see my subsection on the Courseware page$')
 def i_see_my_subsection_on_the_courseware_page(step):
     css = 'span.subsection-name'
     assert world.browser.is_element_present_by_css(css)
     css = 'span.subsection-name-value'
-    assert_css_with_text(css,'Subsection One')
+    assert_css_with_text(css, 'Subsection One')
+
 
 @step('the subsection does not exist$')
 def the_subsection_does_not_exist(step):

cms/djangoapps/contentstore/management/commands/clone.py

@@ -14,6 +14,7 @@ from auth.authz import _copy_course_group
 # To run from command line: rake cms:clone SOURCE_LOC=MITx/111/Foo1 DEST_LOC=MITx/135/Foo3
 #
 
+
 class Command(BaseCommand):
     help = \
 '''Clone a MongoDB backed course to another location'''

cms/djangoapps/contentstore/management/commands/delete_course.py

@@ -15,6 +15,7 @@ from auth.authz import _delete_course_group
 # To run from command line: rake cms:delete_course LOC=MITx/111/Foo1
 #
 
+
 class Command(BaseCommand):
     help = \
 '''Delete a MongoDB backed course'''
@@ -35,6 +36,3 @@ class Command(BaseCommand):
               print 'removing User permissions from course....'
               # in the django layer, we need to remove all the user permissions groups associated with this course
               _delete_course_group(loc)            
-
-
-

cms/djangoapps/contentstore/management/commands/prompt.py

 import sys
 
+
 def query_yes_no(question, default="yes"):
     """Ask a yes/no question via raw_input() and return their answer.
 

cms/djangoapps/contentstore/module_info_model.py

@@ -7,7 +7,8 @@ from lxml import etree
 import re
 from django.http import HttpResponseBadRequest, Http404
 
-def get_module_info(store, location, parent_location = None, rewrite_static_links = False):
+
+def get_module_info(store, location, parent_location=None, rewrite_static_links=False):
   try:
     if location.revision is None:
         module = store.get_item(location)
@@ -36,6 +37,7 @@ def get_module_info(store, location, parent_location = None, rewrite_static_link
         'metadata': module.metadata
     }
 
+
 def set_module_info(store, location, post_data):
   module = None
   isNew = False

cms/djangoapps/contentstore/tests/factories.py

@@ -5,6 +5,7 @@ from student.models import (User, UserProfile, Registration,
                             CourseEnrollmentAllowed)
 from django.contrib.auth.models import Group
 
+
 class UserProfileFactory(Factory):
     FACTORY_FOR = UserProfile
 
@@ -12,12 +13,14 @@ class UserProfileFactory(Factory):
     name = 'Robot Studio'
     courseware = 'course.xml'
 
+
 class RegistrationFactory(Factory):
     FACTORY_FOR = Registration
 
     user = None
     activation_key = uuid4().hex
 
+
 class UserFactory(Factory):
     FACTORY_FOR = User
 
@@ -32,11 +35,13 @@ class UserFactory(Factory):
     last_login = datetime.now()
     date_joined = datetime.now()
 
+
 class GroupFactory(Factory):
     FACTORY_FOR = Group
 
     name = 'test_group'
 
+
 class CourseEnrollmentAllowedFactory(Factory):
     FACTORY_FOR = CourseEnrollmentAllowed
 

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -35,6 +35,7 @@ TEST_DATA_MODULESTORE = copy.deepcopy(settings.MODULESTORE)
 TEST_DATA_MODULESTORE['default']['OPTIONS']['fs_root'] = path('common/test/data')
 TEST_DATA_MODULESTORE['direct']['OPTIONS']['fs_root'] = path('common/test/data')
 
+
 @override_settings(MODULESTORE=TEST_DATA_MODULESTORE)
 class ContentStoreToyCourseTest(ModuleStoreTestCase):
     """
@@ -79,7 +80,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         import_from_xml(modulestore(), 'common/test/data/', ['full'])
 
         ms = modulestore('direct')
-        course = ms.get_item(Location(['i4x','edX','full','course','6.002_Spring_2012', None]))
+        course = ms.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))
 
         # reverse the ordering
         reverse_tabs = []
@@ -87,9 +88,9 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
             if tab['type'] == 'static_tab':
                 reverse_tabs.insert(0, 'i4x://edX/full/static_tab/{0}'.format(tab['url_slug']))
 
-        resp = self.client.post(reverse('reorder_static_tabs'), json.dumps({'tabs':reverse_tabs}), "application/json")
+        resp = self.client.post(reverse('reorder_static_tabs'), json.dumps({'tabs': reverse_tabs}), "application/json")
 
-        course = ms.get_item(Location(['i4x','edX','full','course','6.002_Spring_2012', None]))
+        course = ms.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))
 
         # compare to make sure that the tabs information is in the expected order after the server call
         course_tabs = []
@@ -106,12 +107,12 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         '''
         import_from_xml(modulestore(), 'common/test/data/', ['full'])
         ms = modulestore('direct')
-        effort = ms.get_item(Location(['i4x','edX','full','about','effort', None]))
-        self.assertEqual(effort.definition['data'],'6 hours')
+        effort = ms.get_item(Location(['i4x', 'edX', 'full', 'about', 'effort', None]))
+        self.assertEqual(effort.definition['data'], '6 hours')
 
         # this one should be in a non-override folder
-        effort = ms.get_item(Location(['i4x','edX','full','about','end_date', None]))
-        self.assertEqual(effort.definition['data'],'TBD')
+        effort = ms.get_item(Location(['i4x', 'edX', 'full', 'about', 'end_date', None]))
+        self.assertEqual(effort.definition['data'], 'TBD')
 
     def test_remove_hide_progress_tab(self):
         import_from_xml(modulestore(), 'common/test/data/', ['full'])
@@ -149,12 +150,12 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
 
         # now loop through all the units in the course and verify that the clone can render them, which
         # means the objects are at least present
-        items = ms.get_items(Location(['i4x','edX', 'full', 'vertical', None]))
+        items = ms.get_items(Location(['i4x', 'edX', 'full', 'vertical', None]))
         self.assertGreater(len(items), 0)
-        clone_items = ms.get_items(Location(['i4x', 'MITx','999','vertical', None]))
+        clone_items = ms.get_items(Location(['i4x', 'MITx', '999', 'vertical', None]))
         self.assertGreater(len(clone_items), 0)
         for descriptor in items:
-            new_loc = descriptor.location._replace(org = 'MITx', course='999')
+            new_loc = descriptor.location._replace(org='MITx', course='999')
             print "Checking {0} should now also be at {1}".format(descriptor.location.url(), new_loc.url())
             resp = self.client.get(reverse('edit_unit', kwargs={'location': new_loc.url()}))
             self.assertEqual(resp.status_code, 200)
@@ -169,7 +170,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
 
         delete_course(ms, cs, location)
 
-        items = ms.get_items(Location(['i4x','edX', 'full', 'vertical', None]))
+        items = ms.get_items(Location(['i4x', 'edX', 'full', 'vertical', None]))
         self.assertEqual(len(items), 0)
 
     def verify_content_existence(self, modulestore, root_dir, location, dirname, category_name, filename_suffix=''):
@@ -213,7 +214,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         # reimport
         import_from_xml(ms, root_dir, ['test_export'])
 
-        items = ms.get_items(Location(['i4x','edX', 'full', 'vertical', None]))
+        items = ms.get_items(Location(['i4x', 'edX', 'full', 'vertical', None]))
         self.assertGreater(len(items), 0)
         for descriptor in items:
             print "Checking {0}....".format(descriptor.location.url())
@@ -229,7 +230,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         # import a test course
         import_from_xml(ms, 'common/test/data/', ['full'])
 
-        handout_location= Location(['i4x', 'edX', 'full', 'course_info', 'handouts'])
+        handout_location = Location(['i4x', 'edX', 'full', 'course_info', 'handouts'])
 
         # get module info
         resp = self.client.get(reverse('module_info', kwargs={'module_location': handout_location}))
@@ -365,8 +366,8 @@ class ContentStoreTest(ModuleStoreTestCase):
         CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course')
 
         section_data = {
-            'parent_location' : 'i4x://MITx/999/course/Robot_Super_Course',
-            'template' : 'i4x://edx/templates/chapter/Empty',
+            'parent_location': 'i4x://MITx/999/course/Robot_Super_Course',
+            'template': 'i4x://edx/templates/chapter/Empty',
             'display_name': 'Section One',
             }
 
@@ -382,8 +383,8 @@ class ContentStoreTest(ModuleStoreTestCase):
         CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course')
 
         problem_data = {
-            'parent_location' : 'i4x://MITx/999/course/Robot_Super_Course',
-            'template' : 'i4x://edx/templates/problem/Empty'
+            'parent_location': 'i4x://MITx/999/course/Robot_Super_Course',
+            'template': 'i4x://edx/templates/problem/Empty'
             }
 
         resp = self.client.post(reverse('clone_item'), problem_data)

cms/djangoapps/contentstore/tests/test_core_caching.py

@@ -3,6 +3,7 @@ from xmodule.modulestore import Location
 from xmodule.contentstore.content import StaticContent
 from django.test import TestCase
 
+
 class Content:
     def __init__(self, location, content):
         self.location = location
@@ -11,6 +12,7 @@ class Content:
     def get_id(self):
         return StaticContent.get_id_from_location(self.location)
 
+
 class CachingTestCase(TestCase):
 #   Tests for https://edx.lighthouseapp.com/projects/102637/tickets/112-updating-asset-does-not-refresh-the-cached-copy
     unicodeLocation = Location(u'c4x', u'mitX', u'800', u'thumbnail', u'monsters.jpg')

cms/djangoapps/contentstore/tests/test_course_settings.py

@@ -28,7 +28,7 @@ class ConvertersTestCase(TestCase):
     @staticmethod
     def struct_to_datetime(struct_time):
         return datetime.datetime(struct_time.tm_year, struct_time.tm_mon, struct_time.tm_mday, struct_time.tm_hour,
-                                 struct_time.tm_min, struct_time.tm_sec, tzinfo = UTC())
+                                 struct_time.tm_min, struct_time.tm_sec, tzinfo=UTC())
 
     def compare_dates(self, date1, date2, expected_delta):
         dt1 = ConvertersTestCase.struct_to_datetime(date1)
@@ -68,13 +68,14 @@ class CourseTestCase(ModuleStoreTestCase):
         self.client = Client()
         self.client.login(username=uname, password=password)
 
-        t='i4x://edx/templates/course/Empty'
-        o='MITx'
-        n='999'
-        dn='Robot Super Course'
+        t = 'i4x://edx/templates/course/Empty'
+        o = 'MITx'
+        n = '999'
+        dn = 'Robot Super Course'
         self.course_location = Location('i4x', o, n, 'course', 'Robot_Super_Course')
         CourseFactory.create(template=t, org=o, number=n, display_name=dn)
 
+
 class CourseDetailsTestCase(CourseTestCase):
     def test_virgin_fetch(self):
         details = CourseDetails.fetch(self.course_location)
@@ -118,6 +119,7 @@ class CourseDetailsTestCase(CourseTestCase):
         self.assertEqual(CourseDetails.update_from_json(jsondetails.__dict__).effort,
                              jsondetails.effort, "After set effort")
 
+
 class CourseDetailsViewTest(CourseTestCase):
     def alter_field(self, url, details, field, val):
         setattr(details, field, val)
@@ -141,23 +143,23 @@ class CourseDetailsViewTest(CourseTestCase):
     def test_update_and_fetch(self):
         details = CourseDetails.fetch(self.course_location)
 
-        resp = self.client.get(reverse('course_settings', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course, 
-                                                                  'name' : self.course_location.name }))
+        resp = self.client.get(reverse('course_settings', kwargs={'org': self.course_location.org, 'course': self.course_location.course,
+                                                                  'name': self.course_location.name}))
         self.assertContains(resp, '<li><a href="#" class="is-shown" data-section="details">Course Details</a></li>', status_code=200, html=True)
 
         # resp s/b json from here on
-        url = reverse('course_settings', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course, 
-                                                 'name' : self.course_location.name, 'section' : 'details' })
+        url = reverse('course_settings', kwargs={'org': self.course_location.org, 'course': self.course_location.course,
+                                                 'name': self.course_location.name, 'section': 'details'})
         resp = self.client.get(url)
         self.compare_details_with_encoding(json.loads(resp.content), details.__dict__, "virgin get")
 
         utc = UTC()
-        self.alter_field(url, details, 'start_date', datetime.datetime(2012,11,12,1,30, tzinfo=utc))        
-        self.alter_field(url, details, 'start_date', datetime.datetime(2012,11,1,13,30, tzinfo=utc))
-        self.alter_field(url, details, 'end_date', datetime.datetime(2013,2,12,1,30, tzinfo=utc))
-        self.alter_field(url, details, 'enrollment_start', datetime.datetime(2012,10,12,1,30, tzinfo=utc))
+        self.alter_field(url, details, 'start_date', datetime.datetime(2012, 11, 12, 1, 30, tzinfo=utc))
+        self.alter_field(url, details, 'start_date', datetime.datetime(2012, 11, 1, 13, 30, tzinfo=utc))
+        self.alter_field(url, details, 'end_date', datetime.datetime(2013, 2, 12, 1, 30, tzinfo=utc))
+        self.alter_field(url, details, 'enrollment_start', datetime.datetime(2012, 10, 12, 1, 30, tzinfo=utc))
 
-        self.alter_field(url, details, 'enrollment_end', datetime.datetime(2012,11,15,1,30, tzinfo=utc))
+        self.alter_field(url, details, 'enrollment_end', datetime.datetime(2012, 11, 15, 1, 30, tzinfo=utc))
         self.alter_field(url, details, 'overview', "Overview")
         self.alter_field(url, details, 'intro_video', "intro_video")
         self.alter_field(url, details, 'effort', "effort")
@@ -190,6 +192,7 @@ class CourseDetailsViewTest(CourseTestCase):
         elif field in encoded and encoded[field] is not None:
             self.fail(field + " included in encoding but missing from details at " + context)
 
+
 class CourseGradingTest(CourseTestCase):
     def test_initial_grader(self):
         descriptor = get_modulestore(self.course_location).get_item(self.course_location)

cms/djangoapps/contentstore/tests/test_course_updates.py

@@ -2,27 +2,28 @@ from cms.djangoapps.contentstore.tests.test_course_settings import CourseTestCas
 from django.core.urlresolvers import reverse
 import json
 
+
 class CourseUpdateTest(CourseTestCase):
     def test_course_update(self):
         # first get the update to force the creation
-        url = reverse('course_info', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course, 
-                                       'name' : self.course_location.name })
+        url = reverse('course_info', kwargs={'org': self.course_location.org, 'course': self.course_location.course,
+                                       'name': self.course_location.name})
         self.client.get(url)
 
         content = '<iframe width="560" height="315" src="http://www.youtube.com/embed/RocY-Jd93XU" frameborder="0"></iframe>'
-        payload = { 'content' : content,
-                   'date' : 'January 8, 2013'}
-        url = reverse('course_info', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course,
-                                             'provided_id' : ''})
+        payload = {'content': content,
+                   'date': 'January 8, 2013'}
+        url = reverse('course_info', kwargs={'org': self.course_location.org, 'course': self.course_location.course,
+                                             'provided_id': ''})
 
         resp = self.client.post(url, json.dumps(payload), "application/json")
 
-        payload= json.loads(resp.content)
+        payload = json.loads(resp.content)
 
         self.assertHTMLEqual(content, payload['content'], "single iframe")
 
-        url = reverse('course_info', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course,
-                                             'provided_id' : payload['id']})
+        url = reverse('course_info', kwargs={'org': self.course_location.org, 'course': self.course_location.course,
+                                             'provided_id': payload['id']})
         content += '<div>div <p>p</p></div>'
         payload['content'] = content
         resp = self.client.post(url, json.dumps(payload), "application/json")

cms/djangoapps/contentstore/tests/test_utils.py

@@ -2,15 +2,16 @@ from  cms.djangoapps.contentstore import utils
 import mock
 from django.test import TestCase
 
+
 class LMSLinksTestCase(TestCase):
     def about_page_test(self):
-        location = 'i4x','mitX','101','course', 'test'
+        location = 'i4x', 'mitX', '101', 'course', 'test'
         utils.get_course_id = mock.Mock(return_value="mitX/101/test")
         link = utils.get_lms_link_for_about_page(location)
         self.assertEquals(link, "//localhost:8000/courses/mitX/101/test/about")
 
     def ls_link_test(self):
-        location = 'i4x','mitX','101','vertical', 'contacting_us'
+        location = 'i4x', 'mitX', '101', 'vertical', 'contacting_us'
         utils.get_course_id = mock.Mock(return_value="mitX/101/test")
         link = utils.get_lms_link_for_item(location, False)
         self.assertEquals(link, "//localhost:8000/courses/mitX/101/test/jump_to/i4x://mitX/101/vertical/contacting_us")

cms/djangoapps/contentstore/tests/tests.py

@@ -28,6 +28,7 @@ from xmodule.seq_module import SequenceDescriptor
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from utils import ModuleStoreTestCase, parse_json, user, registration
 
+
 class ContentStoreTestCase(ModuleStoreTestCase):
     def _login(self, email, pw):
         """Login.  View should always return 200.  The success/fail is in the

cms/djangoapps/contentstore/tests/utils.py

@@ -11,6 +11,7 @@ from django.contrib.auth.models import User
 import xmodule.modulestore.django
 from xmodule.templates import update_templates
 
+
 class ModuleStoreTestCase(TestCase):
     """ Subclass for any test case that uses the mongodb
     module store. This populates a uniquely named modulestore
@@ -22,7 +23,7 @@ class ModuleStoreTestCase(TestCase):
 
         # Use the current seconds since epoch to differentiate
         # the mongo collections on jenkins.
-        sec_since_epoch = '%s' % int(time()*100)
+        sec_since_epoch = '%s' % int(time() * 100)
         self.orig_MODULESTORE = copy.deepcopy(settings.MODULESTORE)
         self.test_MODULESTORE = self.orig_MODULESTORE
         self.test_MODULESTORE['default']['OPTIONS']['collection'] = 'modulestore_%s' % sec_since_epoch
@@ -50,14 +51,17 @@ class ModuleStoreTestCase(TestCase):
 
         super(ModuleStoreTestCase, self)._post_teardown()
 
+
 def parse_json(response):
     """Parse response, which is assumed to be json"""
     return json.loads(response.content)
 
+
 def user(email):
     """look up a user by email"""
     return User.objects.get(email=email)
 
+
 def registration(email):
     """look up registration object by email"""
     return Registration.objects.get(user__email=email)

cms/djangoapps/contentstore/utils.py

@@ -5,6 +5,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError
 
 DIRECT_ONLY_CATEGORIES = ['course', 'chapter', 'sequential', 'about', 'static_tab', 'course_info']
 
+
 def get_modulestore(location):
     """
     Returns the correct modulestore to use for modifying the specified location
@@ -17,6 +18,7 @@ def get_modulestore(location):
     else:
         return modulestore()
 
+
 def get_course_location_for_item(location):
     '''
     cdodge: for a given Xmodule, return the course that it belongs to
@@ -46,6 +48,7 @@ def get_course_location_for_item(location):
 
     return location
 
+
 def get_course_for_item(location):
     '''
     cdodge: for a given Xmodule, return the course that it belongs to
@@ -85,6 +88,7 @@ def get_lms_link_for_item(location, preview=False):
 
     return lms_link
 
+
 def get_lms_link_for_about_page(location):
     """
     Returns the url to the course about page from the location tuple.
@@ -99,6 +103,7 @@ def get_lms_link_for_about_page(location):
 
     return lms_link
 
+
 def get_course_id(location):
     """
     Returns the course_id from a given the location tuple.
@@ -106,6 +111,7 @@ def get_course_id(location):
     # TODO: These will need to be changed to point to the particular instance of this problem in the particular course
     return modulestore().get_containing_courses(Location(location))[0].id
 
+
 class UnitState(object):
     draft = 'draft'
     private = 'private'
@@ -135,6 +141,7 @@ def compute_unit_state(unit):
 def get_date_display(date):
     return date.strftime("%d %B, %Y at %I:%M %p")
 
+
 def update_item(location, value):
     """
     If value is None, delete the db entry. Otherwise, update it using the correct modulestore.

cms/djangoapps/models/settings/course_grading.py

@@ -47,12 +47,12 @@ class CourseGradingModel(object):
         # return empty model
         else:
             return {
-                    "id" : index,
-                    "type" : "",
-                    "min_count" : 0,
-                    "drop_count" : 0,
-                    "short_label" : None,
-                    "weight" : 0
+                    "id": index,
+                    "type": "",
+                    "min_count": 0,
+                    "drop_count": 0,
+                    "short_label": None,
+                    "weight": 0
                 }
 
     @staticmethod
@@ -75,7 +75,7 @@ class CourseGradingModel(object):
             course_location = Location(course_location)
 
         descriptor = get_modulestore(course_location).get_item(course_location)
-        return {'grace_period' : CourseGradingModel.convert_set_grace_period(descriptor) }
+        return {'grace_period': CourseGradingModel.convert_set_grace_period(descriptor)}
 
     @staticmethod
     def update_from_json(jsondict):
@@ -211,9 +211,9 @@ class CourseGradingModel(object):
 
         descriptor = get_modulestore(location).get_item(location)
         return {
-                "graderType" : descriptor.metadata.get('format', u"Not Graded"),
-                "location" : location,
-                "id" : 99   # just an arbitrary value to 
+                "graderType": descriptor.metadata.get('format', u"Not Graded"),
+                "location": location,
+                "id": 99   # just an arbitrary value to
                 }
 
     @staticmethod
@@ -245,11 +245,11 @@ class CourseGradingModel(object):
     def parse_grader(json_grader):
         # manual to clear out kruft
         result = {
-                    "type" : json_grader["type"],
-                    "min_count" : int(json_grader.get('min_count', 0)),
-                    "drop_count" : int(json_grader.get('drop_count', 0)),
-                    "short_label" : json_grader.get('short_label', None),
-                    "weight" : float(json_grader.get('weight', 0)) / 100.0
+                    "type": json_grader["type"],
+                    "min_count": int(json_grader.get('min_count', 0)),
+                    "drop_count": int(json_grader.get('drop_count', 0)),
+                    "short_label": json_grader.get('short_label', None),
+                    "weight": float(json_grader.get('weight', 0)) / 100.0
                 }
 
         return result

cms/envs/common.py

@@ -33,7 +33,7 @@ MITX_FEATURES = {
     'USE_DJANGO_PIPELINE': True,
     'GITHUB_PUSH': False,
     'ENABLE_DISCUSSION_SERVICE': False,
-    'AUTH_USE_MIT_CERTIFICATES' : False,
+    'AUTH_USE_MIT_CERTIFICATES': False,
     'STUB_VIDEO_FOR_TESTING': False,   # do not display video when running automated acceptance tests
 }
 ENABLE_JASMINE = False
@@ -229,7 +229,7 @@ PIPELINE_JS = {
         'source_filenames': sorted(
             rooted_glob(COMMON_ROOT / 'static/', 'coffee/src/**/*.coffee') +
             rooted_glob(PROJECT_ROOT / 'static/', 'coffee/src/**/*.coffee')
-        ) + [ 'js/hesitate.js', 'js/base.js'],
+        ) + ['js/hesitate.js', 'js/base.js'],
         'output_filename': 'js/cms-application.js',
     },
     'module-js': {

cms/envs/dev.py

@@ -12,7 +12,7 @@ TEMPLATE_DEBUG = DEBUG
 LOGGING = get_logger_config(ENV_ROOT / "log",
                             logging_env="dev",
                             tracking_filename="tracking.log",
-                            dev_env = True,
+                            dev_env=True,
                             debug=True)
 
 modulestore_options = {
@@ -41,7 +41,7 @@ CONTENTSTORE = {
     'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore',
     'OPTIONS': {
         'host': 'localhost',
-        'db' : 'xcontent',
+        'db': 'xcontent',
     }
 }
 

cms/envs/dev_ike.py

@@ -9,8 +9,6 @@ import socket
 
 MITX_FEATURES['AUTH_USE_MIT_CERTIFICATES'] = True
 
-MITX_FEATURES['USE_DJANGO_PIPELINE']=False      # don't recompile scss
+MITX_FEATURES['USE_DJANGO_PIPELINE'] = False      # don't recompile scss
 
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')  	# django 1.4 for nginx ssl proxy
-
-

cms/envs/test.py

@@ -62,7 +62,7 @@ CONTENTSTORE = {
     'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore',
     'OPTIONS': {
         'host': 'localhost',
-        'db' : 'xcontent',
+        'db': 'xcontent',
     }
 }
 

common/djangoapps/cache_toolbox/core.py

@@ -14,6 +14,7 @@ from django.db import DEFAULT_DB_ALIAS
 from . import app_settings
 from xmodule.contentstore.content import StaticContent
 
+
 def get_instance(model, instance_or_pk, timeout=None, using=None):
     """
     Returns the ``model`` instance with a primary key of ``instance_or_pk``.
@@ -108,11 +109,14 @@ def instance_key(model, instance_or_pk):
         getattr(instance_or_pk, 'pk', instance_or_pk),
     )
 
+
 def set_cached_content(content):
     cache.set(str(content.location), content)
 
+
 def get_cached_content(location):
     return cache.get(str(location))
 
+
 def del_cached_content(location):
     cache.delete(str(location))

common/djangoapps/contentserver/middleware.py

@@ -12,7 +12,7 @@ from xmodule.exceptions import NotFoundError
 class StaticContentServer(object):
     def process_request(self, request):
         # look to see if the request is prefixed with 'c4x' tag
-        if request.path.startswith('/' + XASSET_LOCATION_TAG +'/'):
+        if request.path.startswith('/' + XASSET_LOCATION_TAG + '/'):
             loc = StaticContent.get_location_from_path(request.path)
             # first look in our cache so we don't have to round-trip to the DB
             content = get_cached_content(loc)

common/djangoapps/course_groups/cohorts.py

@@ -13,6 +13,7 @@ from .models import CourseUserGroup
 
 log = logging.getLogger(__name__)
 
+
 def is_course_cohorted(course_id):
     """
     Given a course id, return a boolean for whether or not the course is
@@ -115,6 +116,7 @@ def get_course_cohorts(course_id):
 
 ### Helpers for cohort management views
 
+
 def get_cohort_by_name(course_id, name):
     """
     Return the CourseUserGroup object for the given cohort.  Raises DoesNotExist
@@ -124,6 +126,7 @@ def get_cohort_by_name(course_id, name):
                                        group_type=CourseUserGroup.COHORT,
                                        name=name)
 
+
 def get_cohort_by_id(course_id, cohort_id):
     """
     Return the CourseUserGroup object for the given cohort.  Raises DoesNotExist
@@ -133,6 +136,7 @@ def get_cohort_by_id(course_id, cohort_id):
                                        group_type=CourseUserGroup.COHORT,
                                        id=cohort_id)
 
+
 def add_cohort(course_id, name):
     """
     Add a cohort to a course.  Raises ValueError if a cohort of the same name already
@@ -148,12 +152,14 @@ def add_cohort(course_id, name):
                                           group_type=CourseUserGroup.COHORT,
                                           name=name)
 
+
 class CohortConflict(Exception):
     """
     Raised when user to be added is already in another cohort in same course.
     """
     pass
 
+
 def add_user_to_cohort(cohort, username_or_email):
     """
     Look up the given user, and if successful, add them to the specified cohort.
@@ -211,4 +217,3 @@ def delete_empty_cohort(course_id, name):
                 name, course_id))
 
     cohort.delete()
-

common/djangoapps/course_groups/models.py

@@ -5,6 +5,7 @@ from django.db import models
 
 log = logging.getLogger(__name__)
 
+
 class CourseUserGroup(models.Model):
     """
     This model represents groups of users in a course.  Groups may have different types,
@@ -30,5 +31,3 @@ class CourseUserGroup(models.Model):
     COHORT = 'cohort'
     GROUP_TYPE_CHOICES = ((COHORT, 'Cohort'),)
     group_type = models.CharField(max_length=20, choices=GROUP_TYPE_CHOICES)
-
-

common/djangoapps/course_groups/tests/tests.py

@@ -14,6 +14,7 @@ from xmodule.modulestore.django import modulestore, _MODULESTORES
 # manually overriding the modulestore.  However, running with
 # cms.envs.test doesn't.
 
+
 def xml_store_config(data_dir):
     return {
     'default': {
@@ -28,6 +29,7 @@ def xml_store_config(data_dir):
 TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR)
 
+
 @override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
 class TestCohorts(django.test.TestCase):
 
@@ -184,6 +186,3 @@ class TestCohorts(django.test.TestCase):
         self.assertTrue(
             is_commentable_cohorted(course.id, to_id("Feedback")),
             "Feedback was listed as cohorted.  Should be.")
-
-
-

common/djangoapps/course_groups/views.py

@@ -22,6 +22,7 @@ import track.views
 
 log = logging.getLogger(__name__)
 
+
 def json_http_response(data):
     """
     Return an HttpResponse with the data json-serialized and the right content
@@ -29,6 +30,7 @@ def json_http_response(data):
     """
     return HttpResponse(json.dumps(data), content_type="application/json")
 
+
 def split_by_comma_and_whitespace(s):
     """
     Split a string both by commas and whitespice.  Returns a list.
@@ -177,6 +179,7 @@ def add_users_to_cohort(request, course_id, cohort_id):
                             'conflict': conflict,
                             'unknown': unknown})
 
+
 @ensure_csrf_cookie
 @require_POST
 def remove_user_from_cohort(request, course_id, cohort_id):

common/djangoapps/external_auth/admin.py

@@ -5,8 +5,9 @@ django admin pages for courseware model
 from external_auth.models import *
 from django.contrib import admin
 
+
 class ExternalAuthMapAdmin(admin.ModelAdmin):
-    search_fields = ['external_id','user__username']
+    search_fields = ['external_id', 'user__username']
     date_hierarchy = 'dtcreated'
 
 admin.site.register(ExternalAuthMap, ExternalAuthMapAdmin)

common/djangoapps/external_auth/models.py

@@ -12,6 +12,7 @@ file and check it in at the same time as your model changes. To do that,
 from django.db import models
 from django.contrib.auth.models import User
 
+
 class ExternalAuthMap(models.Model):
     class Meta:
         unique_together = (('external_id', 'external_domain'), )
@@ -19,13 +20,12 @@ class ExternalAuthMap(models.Model):
     external_domain = models.CharField(max_length=255, db_index=True)
     external_credentials = models.TextField(blank=True)  # JSON dictionary
     external_email = models.CharField(max_length=255, db_index=True)
-    external_name = models.CharField(blank=True,max_length=255, db_index=True)
+    external_name = models.CharField(blank=True, max_length=255, db_index=True)
     user = models.OneToOneField(User, unique=True, db_index=True, null=True)
     internal_password = models.CharField(blank=True, max_length=31)  	# randomly generated
-    dtcreated = models.DateTimeField('creation date',auto_now_add=True)
-    dtsignup = models.DateTimeField('signup date',null=True)		# set after signup
+    dtcreated = models.DateTimeField('creation date', auto_now_add=True)
+    dtsignup = models.DateTimeField('signup date', null=True)		# set after signup
 
     def __unicode__(self):
         s = "[%s] = (%s / %s)" % (self.external_id, self.external_name, self.external_email)
         return s
-    

common/djangoapps/external_auth/tests/test_openid_provider.py

@@ -13,6 +13,7 @@ from django.test import TestCase, LiveServerTestCase
 from django.core.urlresolvers import reverse
 from django.test.client import RequestFactory
 
+
 class MyFetcher(HTTPFetcher):
     """A fetcher that uses server-internal calls for performing HTTP
     requests.
@@ -60,6 +61,7 @@ class MyFetcher(HTTPFetcher):
             status=status,
             )
 
+
 class OpenIdProviderTest(TestCase):
 
 #    def setUp(self):
@@ -78,7 +80,7 @@ class OpenIdProviderTest(TestCase):
         provider_url = reverse('openid-provider-xrds')
         factory = RequestFactory()
         request = factory.request()
-        abs_provider_url = request.build_absolute_uri(location = provider_url)
+        abs_provider_url = request.build_absolute_uri(location=provider_url)
 
         # In order for this absolute URL to work (i.e. to get xrds, then authentication)
         # in the test environment, we either need a live server that works with the default
@@ -89,7 +91,7 @@ class OpenIdProviderTest(TestCase):
 
         # now we can begin the login process by invoking a local openid client,
         # with a pointer to the (also-local) openid provider:
-        with self.settings(OPENID_SSO_SERVER_URL = abs_provider_url):
+        with self.settings(OPENID_SSO_SERVER_URL=abs_provider_url):
             url = reverse('openid-login')
             resp = self.client.post(url)
             code = 200
@@ -107,7 +109,7 @@ class OpenIdProviderTest(TestCase):
         provider_url = reverse('openid-provider-login')
         factory = RequestFactory()
         request = factory.request()
-        abs_provider_url = request.build_absolute_uri(location = provider_url)
+        abs_provider_url = request.build_absolute_uri(location=provider_url)
 
         # In order for this absolute URL to work (i.e. to get xrds, then authentication)
         # in the test environment, we either need a live server that works with the default
@@ -118,7 +120,7 @@ class OpenIdProviderTest(TestCase):
 
         # now we can begin the login process by invoking a local openid client,
         # with a pointer to the (also-local) openid provider:
-        with self.settings(OPENID_SSO_SERVER_URL = abs_provider_url):
+        with self.settings(OPENID_SSO_SERVER_URL=abs_provider_url):
             url = reverse('openid-login')
             resp = self.client.post(url)
             code = 200
@@ -154,24 +156,24 @@ class OpenIdProviderTest(TestCase):
             return
         url = reverse('openid-provider-login')
         post_args = {
-                     "openid.mode" : "checkid_setup",
-                     "openid.return_to" : "http://testserver/openid/complete/?janrain_nonce=2013-01-23T06%3A20%3A17ZaN7j6H",
-                     "openid.assoc_handle" : "{HMAC-SHA1}{50ff8120}{rh87+Q==}",
-                     "openid.claimed_id" : "http://specs.openid.net/auth/2.0/identifier_select",
-                     "openid.ns" : "http://specs.openid.net/auth/2.0",
-                     "openid.realm" : "http://testserver/",
-                     "openid.identity" : "http://specs.openid.net/auth/2.0/identifier_select",
-                     "openid.ns.ax" : "http://openid.net/srv/ax/1.0",
-                     "openid.ax.mode" : "fetch_request",
-                     "openid.ax.required" : "email,fullname,old_email,firstname,old_nickname,lastname,old_fullname,nickname",
-                     "openid.ax.type.fullname" : "http://axschema.org/namePerson",
-                     "openid.ax.type.lastname" : "http://axschema.org/namePerson/last",
-                     "openid.ax.type.firstname" : "http://axschema.org/namePerson/first",
-                     "openid.ax.type.nickname" : "http://axschema.org/namePerson/friendly",
-                     "openid.ax.type.email" : "http://axschema.org/contact/email",
-                     "openid.ax.type.old_email" : "http://schema.openid.net/contact/email",
-                     "openid.ax.type.old_nickname" : "http://schema.openid.net/namePerson/friendly",
-                     "openid.ax.type.old_fullname" : "http://schema.openid.net/namePerson",
+                     "openid.mode": "checkid_setup",
+                     "openid.return_to": "http://testserver/openid/complete/?janrain_nonce=2013-01-23T06%3A20%3A17ZaN7j6H",
+                     "openid.assoc_handle": "{HMAC-SHA1}{50ff8120}{rh87+Q==}",
+                     "openid.claimed_id": "http://specs.openid.net/auth/2.0/identifier_select",
+                     "openid.ns": "http://specs.openid.net/auth/2.0",
+                     "openid.realm": "http://testserver/",
+                     "openid.identity": "http://specs.openid.net/auth/2.0/identifier_select",
+                     "openid.ns.ax": "http://openid.net/srv/ax/1.0",
+                     "openid.ax.mode": "fetch_request",
+                     "openid.ax.required": "email,fullname,old_email,firstname,old_nickname,lastname,old_fullname,nickname",
+                     "openid.ax.type.fullname": "http://axschema.org/namePerson",
+                     "openid.ax.type.lastname": "http://axschema.org/namePerson/last",
+                     "openid.ax.type.firstname": "http://axschema.org/namePerson/first",
+                     "openid.ax.type.nickname": "http://axschema.org/namePerson/friendly",
+                     "openid.ax.type.email": "http://axschema.org/contact/email",
+                     "openid.ax.type.old_email": "http://schema.openid.net/contact/email",
+                     "openid.ax.type.old_nickname": "http://schema.openid.net/namePerson/friendly",
+                     "openid.ax.type.old_fullname": "http://schema.openid.net/namePerson",
                      }
         resp = self.client.post(url, post_args)
         code = 200
@@ -196,11 +198,11 @@ class OpenIdProviderLiveServerTest(LiveServerTestCase):
         provider_url = reverse('openid-provider-xrds')
         factory = RequestFactory()
         request = factory.request()
-        abs_provider_url = request.build_absolute_uri(location = provider_url)
+        abs_provider_url = request.build_absolute_uri(location=provider_url)
 
         # now we can begin the login process by invoking a local openid client,
         # with a pointer to the (also-local) openid provider:
-        with self.settings(OPENID_SSO_SERVER_URL = abs_provider_url):
+        with self.settings(OPENID_SSO_SERVER_URL=abs_provider_url):
             url = reverse('openid-login')
             resp = self.client.post(url)
             code = 200

common/djangoapps/mitxmako/makoloader.py

@@ -12,6 +12,7 @@ import mitxmako.middleware
 
 log = logging.getLogger(__name__)
 
+
 class MakoLoader(object):
     """
     This is a Django loader object which will load the template as a
@@ -71,6 +72,7 @@ class MakoFilesystemLoader(MakoLoader):
     def __init__(self):
         MakoLoader.__init__(self, FilesystemLoader())
 
+
 class MakoAppDirectoriesLoader(MakoLoader):
     is_usable = True
 

common/djangoapps/mitxmako/template.py

@@ -20,6 +20,8 @@ from mitxmako import middleware
 django_variables = ['lookup', 'output_encoding', 'encoding_errors']
 
 # TODO: We should make this a Django Template subclass that simply has the MakoTemplate inside of it? (Intead of inheriting from MakoTemplate)
+
+
 class Template(MakoTemplate):
     """
     This bridges the gap between a Mako template and a djano template. It can

common/djangoapps/mitxmako/templatetag_helpers.py

@@ -2,6 +2,7 @@ from django.template import loader
 from django.template.base import Template, Context
 from django.template.loader import get_template, select_template
 
+
 def django_template_include(file_name, mako_context):
     """
     This can be used within a mako template to include a django template
@@ -9,7 +10,7 @@ def django_template_include(file_name, mako_context):
     which can be the mako context ('context') or a dictionary.
     """
 
-    dictionary = dict( mako_context )
+    dictionary = dict(mako_context)
     return loader.render_to_string(file_name, dictionary=dictionary)
 
 
@@ -49,5 +50,3 @@ def render_inclusion(func, file_name, takes_context, django_context, *args, **kw
         new_context['csrf_token'] = csrf_token
 
     return nodelist.render(new_context)
-    
-

common/djangoapps/static_replace/__init__.py

@@ -21,6 +21,7 @@ def _url_replace_regex(prefix):
         (?P=quote)           # the first matching closing quote
         """.format(prefix=prefix)
 
+
 def try_staticfiles_lookup(path):
     """
     Try to lookup a path in staticfiles_storage.  If it fails, return

common/djangoapps/static_replace/test/test_static_replace.py

@@ -53,6 +53,7 @@ def test_mongo_filestore(mock_modulestore, mock_static_content):
 
     mock_static_content.convert_legacy_static_url.assert_called_once_with('file.png', NAMESPACE)
 
+
 @patch('static_replace.settings')
 @patch('static_replace.modulestore')
 @patch('static_replace.staticfiles_storage')

common/djangoapps/status/__init__.py

-

common/djangoapps/status/status.py

@@ -10,6 +10,7 @@ import sys
 
 log = logging.getLogger(__name__)
 
+
 def get_site_status_msg(course_id):
     """
     Look for a file settings.STATUS_MESSAGE_PATH.  If found, read it,

common/djangoapps/student/management/commands/6002exportusers.py

@@ -57,7 +57,7 @@ from student.userprofile. '''
                 d[key] = item
             return d
 
-        extracted = [{'up':extract_dict(up_keys, t[0]), 'u':extract_dict(user_keys, t[1])} for t in user_tuples]
+        extracted = [{'up': extract_dict(up_keys, t[0]), 'u':extract_dict(user_keys, t[1])} for t in user_tuples]
         fp = open('transfer_users.txt', 'w')
         json.dump(extracted, fp)
         fp.close()

common/djangoapps/student/management/commands/add_to_group.py

@@ -3,6 +3,7 @@ from optparse import make_option
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import User, Group
 
+
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('--list',

common/djangoapps/student/management/commands/create_random_users.py

@@ -8,6 +8,7 @@ from student.models import UserProfile, CourseEnrollment
 
 from student.views import _do_create_account, get_random_post_override
 
+
 def create(n, course_id):
     """Create n users, enrolling them in course_id if it's not None"""
     for i in range(n):
@@ -15,6 +16,7 @@ def create(n, course_id):
         if course_id is not None:
             CourseEnrollment.objects.create(user=user, course_id=course_id)
 
+
 class Command(BaseCommand):
     help = """Create N new users, with random parameters.
 

common/djangoapps/student/management/commands/pearson_dump.py

@@ -49,19 +49,19 @@ class Command(BaseCommand):
         for registration in registrations:
             if 'accommodation_pending' in options and options['accommodation_pending'] and not registration.accommodation_is_pending:
                 continue
-            record = {'username' : registration.testcenter_user.user.username,
-                      'email' : registration.testcenter_user.email,
-                      'first_name' : registration.testcenter_user.first_name,
-                      'last_name' : registration.testcenter_user.last_name,
-                      'client_candidate_id' : registration.client_candidate_id,
-                      'client_authorization_id' : registration.client_authorization_id,
-                      'course_id' : registration.course_id,
-                      'exam_series_code' : registration.exam_series_code,
-                      'accommodation_request' : registration.accommodation_request,
-                      'accommodation_code' : registration.accommodation_code,
-                      'registration_status' : registration.registration_status(),
-                      'demographics_status' : registration.demographics_status(),
-                      'accommodation_status' : registration.accommodation_status(),
+            record = {'username': registration.testcenter_user.user.username,
+                      'email': registration.testcenter_user.email,
+                      'first_name': registration.testcenter_user.first_name,
+                      'last_name': registration.testcenter_user.last_name,
+                      'client_candidate_id': registration.client_candidate_id,
+                      'client_authorization_id': registration.client_authorization_id,
+                      'course_id': registration.course_id,
+                      'exam_series_code': registration.exam_series_code,
+                      'accommodation_request': registration.accommodation_request,
+                      'accommodation_code': registration.accommodation_code,
+                      'registration_status': registration.registration_status(),
+                      'demographics_status': registration.demographics_status(),
+                      'accommodation_status': registration.accommodation_status(),
                       }
             if len(registration.upload_error_message) > 0:
                 record['registration_error'] = registration.upload_error_message
@@ -75,4 +75,3 @@ class Command(BaseCommand):
         # dump output:
         with open(outputfile, 'w') as outfile:
             dump(output, outfile, indent=2)
-

common/djangoapps/student/management/commands/pearson_import_conf_zip.py

@@ -116,4 +116,3 @@ class Command(BaseCommand):
                     tcuser.save()
                 except TestCenterUser.DoesNotExist:
                     Command.datadog_error(" Failed to find record for client_candidate_id {}".format(client_candidate_id), vcdcfile.name)
-

common/djangoapps/student/management/commands/pearson_make_tc_registration.py

@@ -9,6 +9,7 @@ from student.views import course_from_id
 from xmodule.course_module import CourseDescriptor
 from xmodule.modulestore.exceptions import ItemNotFoundError
 
+
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         # registration info:
@@ -120,9 +121,9 @@ class Command(BaseCommand):
         else:
             # otherwise use explicit values (so we don't have to define a course):
             exam_name = "Dummy Placeholder Name"
-            exam_info = { 'Exam_Series_Code': our_options['exam_series_code'],
-                          'First_Eligible_Appointment_Date' : our_options['eligibility_appointment_date_first'],
-                          'Last_Eligible_Appointment_Date' : our_options['eligibility_appointment_date_last'],
+            exam_info = {'Exam_Series_Code': our_options['exam_series_code'],
+                          'First_Eligible_Appointment_Date': our_options['eligibility_appointment_date_first'],
+                          'Last_Eligible_Appointment_Date': our_options['eligibility_appointment_date_last'],
                           }
             exam = CourseDescriptor.TestCenterExam(course_id, exam_name, exam_info)
             # update option values for date_first and date_last to use YYYY-MM-DD format
@@ -135,7 +136,7 @@ class Command(BaseCommand):
 
         exam_code = exam.exam_series_code
 
-        UPDATE_FIELDS = ( 'accommodation_request',
+        UPDATE_FIELDS = ('accommodation_request',
                           'accommodation_code',
                           'client_authorization_id',
                           'exam_series_code',
@@ -152,7 +153,7 @@ class Command(BaseCommand):
                 if fieldname in our_options and registration.__getattribute__(fieldname) != our_options[fieldname]:
                     needs_updating = True;
         else:
-            accommodation_request = our_options.get('accommodation_request','')
+            accommodation_request = our_options.get('accommodation_request', '')
             registration = TestCenterRegistration.create(testcenter_user, exam, accommodation_request)
             needs_updating = True
 
@@ -194,7 +195,7 @@ class Command(BaseCommand):
         if 'exam_series_code' in our_options:
             exam_code = our_options['exam_series_code']
         registration = get_testcenter_registration(student, course_id, exam_code)[0]
-        for internal_field in [ 'upload_error_message', 'upload_status', 'authorization_id']:
+        for internal_field in ['upload_error_message', 'upload_status', 'authorization_id']:
             if internal_field in our_options:
                 registration.__setattr__(internal_field, our_options[internal_field])
                 change_internal = True
@@ -204,5 +205,3 @@ class Command(BaseCommand):
             registration.save()
         else:
             print "No changes necessary to make to confirmation information in existing user's registration."
-        
-            

common/djangoapps/student/management/commands/pearson_make_tc_user.py

@@ -5,6 +5,7 @@ from django.core.management.base import BaseCommand, CommandError
 
 from student.models import TestCenterUser, TestCenterUserForm
 
+
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         # demographics:
@@ -177,7 +178,7 @@ class Command(BaseCommand):
         # override internal values:
         change_internal = False
         testcenter_user = TestCenterUser.objects.get(user=student)
-        for internal_field in [ 'upload_error_message', 'upload_status', 'client_candidate_id']:
+        for internal_field in ['upload_error_message', 'upload_status', 'client_candidate_id']:
             if internal_field in our_options:
                 testcenter_user.__setattr__(internal_field, our_options[internal_field])
                 change_internal = True
@@ -187,4 +188,3 @@ class Command(BaseCommand):
             print "Updated  confirmation information in existing user's demographics."
         else:
             print "No changes necessary to make to confirmation information in existing user's demographics."
-            

common/djangoapps/student/management/commands/pearson_transfer.py

@@ -49,7 +49,7 @@ class Command(BaseCommand):
 
         # check additional required settings for import and export:
         if options['mode'] in ('export', 'both'):
-            for value in ['LOCAL_EXPORT','SFTP_EXPORT']: 
+            for value in ['LOCAL_EXPORT', 'SFTP_EXPORT']:
                 if value not in settings.PEARSON:
                     raise CommandError('No entry in the PEARSON settings'
                                        '(env/auth.json) for {0}'.format(value))
@@ -59,7 +59,7 @@ class Command(BaseCommand):
                 os.makedirs(source_dir)
 
         if options['mode'] in ('import', 'both'):
-            for value in ['LOCAL_IMPORT','SFTP_IMPORT']: 
+            for value in ['LOCAL_IMPORT', 'SFTP_IMPORT']:
                 if value not in settings.PEARSON:
                     raise CommandError('No entry in the PEARSON settings'
                                        '(env/auth.json) for {0}'.format(value))
@@ -135,17 +135,17 @@ class Command(BaseCommand):
             k.set_contents_from_filename(source_file)
 
         def export_pearson():
-            options = { 'dest-from-settings' : True }
+            options = {'dest-from-settings': True}
             call_command('pearson_export_cdd', **options)
             call_command('pearson_export_ead', **options)
             mode = 'export'
-            sftp(settings.PEARSON['LOCAL_EXPORT'], settings.PEARSON['SFTP_EXPORT'], mode, deleteAfterCopy = False)
+            sftp(settings.PEARSON['LOCAL_EXPORT'], settings.PEARSON['SFTP_EXPORT'], mode, deleteAfterCopy=False)
             s3(settings.PEARSON['LOCAL_EXPORT'], settings.PEARSON['S3_BUCKET'], mode, deleteAfterCopy=True)
 
         def import_pearson():
             mode = 'import'
             try:
-                sftp(settings.PEARSON['SFTP_IMPORT'], settings.PEARSON['LOCAL_IMPORT'], mode, deleteAfterCopy = True)
+                sftp(settings.PEARSON['SFTP_IMPORT'], settings.PEARSON['LOCAL_IMPORT'], mode, deleteAfterCopy=True)
                 s3(settings.PEARSON['LOCAL_IMPORT'], settings.PEARSON['S3_BUCKET'], mode, deleteAfterCopy=False)
             except Exception as e:
                 dog_http_api.event('Pearson Import failure', str(e))

common/djangoapps/student/models.py

@@ -107,6 +107,7 @@ class UserProfile(models.Model):
 TEST_CENTER_STATUS_ACCEPTED = "Accepted"
 TEST_CENTER_STATUS_ERROR = "Error"
 
+
 class TestCenterUser(models.Model):
     """This is our representation of the User for in-person testing, and
     specifically for Pearson at this point. A few things to note:
@@ -190,7 +191,7 @@ class TestCenterUser(models.Model):
 
     @staticmethod
     def user_provided_fields():
-        return [ 'first_name', 'middle_name', 'last_name', 'suffix', 'salutation',
+        return ['first_name', 'middle_name', 'last_name', 'suffix', 'salutation',
                 'address_1', 'address_2', 'address_3', 'city', 'state', 'postal_code', 'country',
                 'phone', 'extension', 'phone_country_code', 'fax', 'fax_country_code', 'company_name']
 
@@ -208,7 +209,7 @@ class TestCenterUser(models.Model):
     @staticmethod
     def _generate_edx_id(prefix):
         NUM_DIGITS = 12
-        return u"{}{:012}".format(prefix, randint(1, 10**NUM_DIGITS-1))
+        return u"{}{:012}".format(prefix, randint(1, 10 ** NUM_DIGITS - 1))
 
     @staticmethod
     def _generate_candidate_id():
@@ -237,10 +238,11 @@ class TestCenterUser(models.Model):
     def is_pending(self):
         return not self.is_accepted and not self.is_rejected
 
+
 class TestCenterUserForm(ModelForm):
     class Meta:
         model = TestCenterUser
-        fields = ( 'first_name', 'middle_name', 'last_name', 'suffix', 'salutation',
+        fields = ('first_name', 'middle_name', 'last_name', 'suffix', 'salutation',
                 'address_1', 'address_2', 'address_3', 'city', 'state', 'postal_code', 'country',
                 'phone', 'extension', 'phone_country_code', 'fax', 'fax_country_code', 'company_name')
 
@@ -313,7 +315,8 @@ ACCOMMODATION_CODES = (
                       ('SRSGNR', 'Separate Room and Sign Language Interpreter'),
                       )
 
-ACCOMMODATION_CODE_DICT = { code : name for (code, name) in ACCOMMODATION_CODES }
+ACCOMMODATION_CODE_DICT = {code: name for (code, name) in ACCOMMODATION_CODES}
+
 
 class TestCenterRegistration(models.Model):
     """
@@ -417,7 +420,7 @@ class TestCenterRegistration(models.Model):
 
     @classmethod
     def create(cls, testcenter_user, exam, accommodation_request):
-        registration = cls(testcenter_user = testcenter_user)
+        registration = cls(testcenter_user=testcenter_user)
         registration.course_id = exam.course_id
         registration.accommodation_request = accommodation_request.strip()
         registration.exam_series_code = exam.exam_series_code
@@ -501,7 +504,7 @@ class TestCenterRegistration(models.Model):
         return self.accommodation_code.split('*')
 
     def get_accommodation_names(self):
-        return [ ACCOMMODATION_CODE_DICT.get(code, "Unknown code " + code) for code in self.get_accommodation_codes() ]
+        return [ACCOMMODATION_CODE_DICT.get(code, "Unknown code " + code) for code in self.get_accommodation_codes()]
 
     @property
     def registration_signup_url(self):
@@ -537,7 +540,7 @@ class TestCenterRegistration(models.Model):
 class TestCenterRegistrationForm(ModelForm):
     class Meta:
         model = TestCenterRegistration
-        fields = ( 'accommodation_request', 'accommodation_code' )
+        fields = ('accommodation_request', 'accommodation_code')
 
     def clean_accommodation_request(self):
         code = self.cleaned_data['accommodation_request']
@@ -576,6 +579,7 @@ def get_testcenter_registration(user, course_id, exam_series_code):
 # Correct this (https://nose.readthedocs.org/en/latest/finding_tests.html)
 get_testcenter_registration.__test__ = False
 
+
 def unique_id_for_user(user):
     """
     Return a unique id for a user, suitable for inserting into
@@ -666,6 +670,7 @@ class CourseEnrollmentAllowed(models.Model):
 
 #### Helper methods for use from python manage.py shell and other classes.
 
+
 def get_user_by_username_or_email(username_or_email):
     """
     Return a User object, looking up by email if username_or_email contains a
@@ -767,4 +772,3 @@ def update_user_information(sender, instance, created, **kwargs):
         log = logging.getLogger("mitx.discussion")
         log.error(unicode(e))
         log.error("update user info to discussion failed for user with id: " + str(instance.id))
-

common/djangoapps/student/tests.py

@@ -17,6 +17,7 @@ COURSE_2 = 'edx/full/6.002_Spring_2012'
 
 log = logging.getLogger(__name__)
 
+
 class CourseEndingTest(TestCase):
     """Test things related to course endings: certificates, surveys, etc"""
 
@@ -40,7 +41,7 @@ class CourseEndingTest(TestCase):
                          {'status': 'processing',
                           'show_disabled_download_button': False,
                           'show_download_url': False,
-                          'show_survey_button': False,})
+                          'show_survey_button': False, })
 
         cert_status = {'status': 'unavailable'}
         self.assertEqual(_cert_info(user, course, cert_status),

common/djangoapps/student/views.py

@@ -50,6 +50,7 @@ from statsd import statsd
 log = logging.getLogger("mitx.student")
 Article = namedtuple('Article', 'title url author image deck publication publish_date')
 
+
 def csrf_token(context):
     ''' A csrf token that can be included in a form.
     '''
@@ -74,7 +75,7 @@ def index(request, extra_context={}, user=None):
 
     # The course selection work is done in courseware.courses.
     domain = settings.MITX_FEATURES.get('FORCE_UNIVERSITY_DOMAIN')  	# normally False
-    if domain==False:				# do explicit check, because domain=None is valid
+    if domain == False:				# do explicit check, because domain=None is valid
         domain = request.META.get('HTTP_HOST')
 
     courses = get_courses(None, domain=domain)
@@ -97,6 +98,7 @@ import re
 day_pattern = re.compile('\s\d+,\s')
 multimonth_pattern = re.compile('\s?\-\s?\S+\s')
 
+
 def get_date_for_press(publish_date):
     import datetime
     # strip off extra months, and just use the first:
@@ -107,6 +109,7 @@ def get_date_for_press(publish_date):
         date = datetime.datetime.strptime(date, "%B, %Y")
     return date
 
+
 def press(request):
     json_articles = cache.get("student_press_json_articles")
     if json_articles == None:
@@ -148,6 +151,7 @@ def cert_info(user, course):
 
     return _cert_info(user, course, certificate_status_for_student(user, course.id))
 
+
 def _cert_info(user, course, cert_status):
     """
     Implements the logic for cert_info -- split out for testing.
@@ -175,7 +179,7 @@ def _cert_info(user, course, cert_status):
 
     d = {'status': status,
          'show_download_url': status == 'ready',
-         'show_disabled_download_button': status == 'generating',}
+         'show_disabled_download_button': status == 'generating', }
 
     if (status in ('generating', 'ready', 'notpassing', 'restricted') and
         course.end_of_course_survey_url is not None):
@@ -204,6 +208,7 @@ def _cert_info(user, course, cert_status):
 
     return d
 
+
 @login_required
 @ensure_csrf_cookie
 def dashboard(request):
@@ -237,9 +242,9 @@ def dashboard(request):
     show_courseware_links_for = frozenset(course.id for course in courses
                                           if has_access(request.user, course, 'load'))
 
-    cert_statuses = { course.id: cert_info(request.user, course) for course in courses}
+    cert_statuses = {course.id: cert_info(request.user, course) for course in courses}
 
-    exam_registrations = { course.id: exam_registration_info(request.user, course) for course in courses}
+    exam_registrations = {course.id: exam_registration_info(request.user, course) for course in courses}
 
     # Get the 3 most recent news
     top_news = _get_news(top=3)
@@ -248,7 +253,7 @@ def dashboard(request):
                'message': message,
                'staff_access': staff_access,
                'errored_courses': errored_courses,
-               'show_courseware_links_for' : show_courseware_links_for,
+               'show_courseware_links_for': show_courseware_links_for,
                'cert_statuses': cert_statuses,
                'news': top_news,
                'exam_registrations': exam_registrations,
@@ -312,7 +317,7 @@ def change_enrollment(request):
                     'error': 'enrollment in {} not allowed at this time'
                     .format(course.display_name)}
 
-        org, course_num, run=course_id.split("/")
+        org, course_num, run = course_id.split("/")
         statsd.increment("common.student.enrollment",
                         tags=["org:{0}".format(org),
                               "course:{0}".format(course_num),
@@ -326,7 +331,7 @@ def change_enrollment(request):
             enrollment = CourseEnrollment.objects.get(user=user, course_id=course_id)
             enrollment.delete()
 
-            org, course_num, run=course_id.split("/")
+            org, course_num, run = course_id.split("/")
             statsd.increment("common.student.unenrollment",
                             tags=["org:{0}".format(org),
                                   "course:{0}".format(course_num),
@@ -345,7 +350,7 @@ def change_enrollment(request):
 def accounts_login(request, error=""):
 
 
-    return render_to_response('accounts_login.html', { 'error': error })
+    return render_to_response('accounts_login.html', {'error': error})
 
 
 
@@ -424,6 +429,7 @@ def change_setting(request):
     return HttpResponse(json.dumps({'success': True,
                                     'location': up.location, }))
 
+
 def _do_create_account(post_vars):
     """
     Given cleaned post variables, create the User and UserProfile objects, as well as the
@@ -551,7 +557,7 @@ def create_account(request, post_override=None):
 
     # Ok, looks like everything is legit.  Create the account.
     ret = _do_create_account(post_vars)
-    if isinstance(ret,HttpResponse):		# if there was an error then return that
+    if isinstance(ret, HttpResponse):		# if there was an error then return that
         return ret
     (user, profile, registration) = ret
 
@@ -591,7 +597,7 @@ def create_account(request, post_override=None):
         eamap.user = login_user
         eamap.dtsignup = datetime.datetime.now()
         eamap.save()
-        log.debug('Updated ExternalAuthMap for %s to be %s' % (post_vars['username'],eamap))
+        log.debug('Updated ExternalAuthMap for %s to be %s' % (post_vars['username'], eamap))
 
         if settings.MITX_FEATURES.get('BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH'):
             log.debug('bypassing activation email')
@@ -603,6 +609,7 @@ def create_account(request, post_override=None):
     js = {'success': True}
     return HttpResponse(json.dumps(js), mimetype="application/json")
 
+
 def exam_registration_info(user, course):
     """ Returns a Registration object if the user is currently registered for a current
     exam of the course.  Returns None if the user is not registered, or if there is no
@@ -620,6 +627,7 @@ def exam_registration_info(user, course):
         registration = None
     return registration
 
+
 @login_required
 @ensure_csrf_cookie
 def begin_exam_registration(request, course_id):
@@ -663,6 +671,7 @@ def begin_exam_registration(request, course_id):
 
     return render_to_response('test_center_register.html', context)
 
+
 @ensure_csrf_cookie
 def create_exam_registration(request, post_override=None):
     '''
@@ -725,7 +734,7 @@ def create_exam_registration(request, post_override=None):
         # this registration screen.
 
     else:
-        accommodation_request = post_vars.get('accommodation_request','')
+        accommodation_request = post_vars.get('accommodation_request', '')
         registration = TestCenterRegistration.create(testcenter_user, exam, accommodation_request)
         needs_saving = True
         log.info("User {0} enrolled in course {1} creating new exam registration".format(user.username, course_id))
@@ -834,16 +843,17 @@ def password_reset(request):
 
     form = PasswordResetForm(request.POST)
     if form.is_valid():
-        form.save(use_https = request.is_secure(),
-                  from_email = settings.DEFAULT_FROM_EMAIL,
-                  request = request,
-                  domain_override = request.get_host())
-        return HttpResponse(json.dumps({'success':True,
+        form.save(use_https=request.is_secure(),
+                  from_email=settings.DEFAULT_FROM_EMAIL,
+                  request=request,
+                  domain_override=request.get_host())
+        return HttpResponse(json.dumps({'success': True,
                                         'value': render_to_string('registration/password_reset_done.html', {})}))
     else:
         return HttpResponse(json.dumps({'success': False,
                                         'error': 'Invalid e-mail'}))
 
+
 @ensure_csrf_cookie
 def reactivation_email(request):
     ''' Send an e-mail to reactivate a deactivated account, or to
@@ -856,6 +866,7 @@ def reactivation_email(request):
                                         'error': 'No inactive user with this e-mail exists'}))
     return reactivation_email_for_user(user)
 
+
 def reactivation_email_for_user(user):
     reg = Registration.objects.get(user=user)
 
@@ -996,11 +1007,11 @@ def pending_name_changes(request):
 
     changes = list(PendingNameChange.objects.all())
     js = {'students': [{'new_name': c.new_name,
-                        'rationale':c.rationale,
-                        'old_name':UserProfile.objects.get(user=c.user).name,
-                        'email':c.user.email,
-                        'uid':c.user.id,
-                        'cid':c.id} for c in changes]}
+                        'rationale': c.rationale,
+                        'old_name': UserProfile.objects.get(user=c.user).name,
+                        'email': c.user.email,
+                        'uid': c.user.id,
+                        'cid': c.id} for c in changes]}
     return render_to_response('name_changes.html', js)
 
 
@@ -1057,6 +1068,8 @@ def accept_name_change(request):
 
 # TODO: This is a giant kludge to give Pearson something to test against ASAP.
 #       Will need to get replaced by something that actually ties into TestCenterUser
+
+
 @csrf_exempt
 def test_center_login(request):
     if not settings.MITX_FEATURES.get('ENABLE_PEARSON_HACK_TEST'):

common/djangoapps/track/models.py

@@ -2,21 +2,20 @@ from django.db import models
 
 from django.db import models
 
+
 class TrackingLog(models.Model):
-    dtcreated = models.DateTimeField('creation date',auto_now_add=True)
-    username = models.CharField(max_length=32,blank=True)
-    ip = models.CharField(max_length=32,blank=True)
+    dtcreated = models.DateTimeField('creation date', auto_now_add=True)
+    username = models.CharField(max_length=32, blank=True)
+    ip = models.CharField(max_length=32, blank=True)
     event_source = models.CharField(max_length=32)
-    event_type = models.CharField(max_length=512,blank=True)
+    event_type = models.CharField(max_length=512, blank=True)
     event = models.TextField(blank=True)
-    agent = models.CharField(max_length=256,blank=True)
-    page = models.CharField(max_length=512,blank=True,null=True)
+    agent = models.CharField(max_length=256, blank=True)
+    page = models.CharField(max_length=512, blank=True, null=True)
     time = models.DateTimeField('event time')
-    host = models.CharField(max_length=64,blank=True)
+    host = models.CharField(max_length=64, blank=True)
 
     def __unicode__(self):
         s = "[%s] %s@%s: %s | %s | %s | %s" % (self.time, self.username, self.ip, self.event_source,
                                                self.event_type, self.page, self.event)
         return s
-
-

common/djangoapps/track/views.py

@@ -17,19 +17,21 @@ from track.models import TrackingLog
 
 log = logging.getLogger("tracking")
 
-LOGFIELDS = ['username','ip','event_source','event_type','event','agent','page','time','host']
+LOGFIELDS = ['username', 'ip', 'event_source', 'event_type', 'event', 'agent', 'page', 'time', 'host']
+
 
 def log_event(event):
     event_str = json.dumps(event)
     log.info(event_str[:settings.TRACK_MAX_EVENT])
     if settings.MITX_FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
         event['time'] = dateutil.parser.parse(event['time'])
-        tldat = TrackingLog(**dict( (x,event[x]) for x in LOGFIELDS ))
+        tldat = TrackingLog(**dict((x, event[x]) for x in LOGFIELDS))
         try:
             tldat.save()
         except Exception as err:
             log.exception(err)
 
+
 def user_track(request):
     try:  # TODO: Do the same for many of the optional META parameters
         username = request.user.username
@@ -91,9 +93,10 @@ def server_track(request, event_type, event, page=None):
         return
     log_event(event)
 
+
 @login_required
 @ensure_csrf_cookie
-def view_tracking_log(request,args=''):
+def view_tracking_log(request, args=''):
     if not request.user.is_staff:
         return redirect('/')
     nlen = 100
@@ -115,5 +118,4 @@ def view_tracking_log(request,args=''):
     for rinst in record_instances:
         rinst.dtstr = rinst.time.replace(tzinfo=pytz.utc).astimezone(pytz.timezone('US/Eastern')).strftime(fmt)
 
-    return render_to_response('tracking_log.html',{'records':record_instances})
-
+    return render_to_response('tracking_log.html', {'records': record_instances})

common/djangoapps/util/cache.py

@@ -58,4 +58,3 @@ def cache_if_anonymous(view_func):
             return view_func(request, *args, **kwargs)
 
     return _decorated
-

common/djangoapps/util/converters.py

-import time, datetime
+import time
+import datetime
 import re
 import calendar
 
+
 def time_to_date(time_obj):
     """
     Convert a time.time_struct to a true universal time (can pass to js Date constructor)
@@ -9,6 +11,7 @@ def time_to_date(time_obj):
     # TODO change to using the isoformat() function on datetime. js date can parse those
     return calendar.timegm(time_obj) * 1000
 
+
 def jsdate_to_time(field):
     """
     Convert a universal time (iso format) or msec since epoch to a time obj
@@ -16,7 +19,7 @@ def jsdate_to_time(field):
     if field is None:
         return field
     elif isinstance(field, basestring):  # iso format but ignores time zone assuming it's Z
-        d=datetime.datetime(*map(int, re.split('[^\d]', field)[:6])) # stop after seconds. Debatable  
+        d = datetime.datetime(*map(int, re.split('[^\d]', field)[:6]))   # stop after seconds. Debatable
         return d.utctimetuple()
     elif isinstance(field, int) or isinstance(field, float):
         return time.gmtime(field / 1000)

common/djangoapps/util/json_request.py

@@ -13,7 +13,7 @@ def expect_json(view_function):
     def expect_json_with_cloned_request(request, *args, **kwargs):
         # cdodge: fix postback errors in CMS. The POST 'content-type' header can include additional information
         # e.g. 'charset', so we can't do a direct string compare
-        if request.META.get('CONTENT_TYPE','').lower().startswith("application/json"):
+        if request.META.get('CONTENT_TYPE', '').lower().startswith("application/json"):
             cloned_request = copy.copy(request)
             cloned_request.POST = cloned_request.POST.copy()
             cloned_request.POST.update(json.loads(request.body))

common/djangoapps/util/views.py

@@ -93,6 +93,7 @@ def accepts(request, media_type):
     accept = parse_accept_header(request.META.get("HTTP_ACCEPT", ""))
     return media_type in [t for (t, p, q) in accept]
 
+
 def debug_request(request):
     """Return a pretty printed version of the request"""
 

common/djangoapps/xmodule_modifiers.py

@@ -12,6 +12,7 @@ from xmodule.vertical_module import VerticalModule
 
 log = logging.getLogger("mitx.xmodule_modifiers")
 
+
 def wrap_xmodule(get_html, module, template, context=None):
     """
     Wraps the results of get_html in a standard <section> with identifying
@@ -32,7 +33,7 @@ def wrap_xmodule(get_html, module, template, context=None):
     def _get_html():
         context.update({
             'content': get_html(),
-            'display_name' : module.metadata.get('display_name') if module.metadata is not None else None,
+            'display_name': module.metadata.get('display_name') if module.metadata is not None else None,
             'class_': module.__class__.__name__,
             'module_name': module.js_module_name
         })
@@ -52,6 +53,7 @@ def replace_course_urls(get_html, course_id):
         return static_replace.replace_course_urls(get_html(), course_id)
     return _get_html
 
+
 def replace_static_urls(get_html, data_dir, course_namespace=None):
     """
     Updates the supplied module with a new get_html function that wraps
@@ -64,6 +66,7 @@ def replace_static_urls(get_html, data_dir, course_namespace=None):
         return static_replace.replace_static_urls(get_html(), data_dir, course_namespace)
     return _get_html
 
+
 def grade_histogram(module_id):
     ''' Print out a histogram of grades on a given problem.
         Part of staff member debug info.
@@ -114,35 +117,35 @@ def add_histogram(get_html, module, user):
                 # doesn't like symlinks)
                 filepath = filename
             data_dir = osfs.root_path.rsplit('/')[-1]
-            giturl = module.metadata.get('giturl','https://github.com/MITx')
-            edit_link = "%s/%s/tree/master/%s" % (giturl,data_dir,filepath)
+            giturl = module.metadata.get('giturl', 'https://github.com/MITx')
+            edit_link = "%s/%s/tree/master/%s" % (giturl, data_dir, filepath)
         else:
             edit_link = False
             # Need to define all the variables that are about to be used
             giturl = ""
             data_dir = ""
-        source_file = module.metadata.get('source_file','')	# source used to generate the problem XML, eg latex or word
+        source_file = module.metadata.get('source_file', '')  	# source used to generate the problem XML, eg latex or word
 
         # useful to indicate to staff if problem has been released or not
         # TODO (ichuang): use _has_access_descriptor.can_load in lms.courseware.access, instead of now>mstart comparison here
         now = time.gmtime()
         is_released = "unknown"
-        mstart = getattr(module.descriptor,'start')
+        mstart = getattr(module.descriptor, 'start')
         if mstart is not None:
             is_released = "<font color='red'>Yes!</font>" if (now > mstart) else "<font color='green'>Not yet</font>"
 
         staff_context = {'definition': module.definition.get('data'),
                          'metadata': json.dumps(module.metadata, indent=4),
                          'location': module.location,
-                         'xqa_key': module.metadata.get('xqa_key',''),
-                         'source_file' : source_file,
-                         'source_url': '%s/%s/tree/master/%s' % (giturl,data_dir,source_file),
+                         'xqa_key': module.metadata.get('xqa_key', ''),
+                         'source_file': source_file,
+                         'source_url': '%s/%s/tree/master/%s' % (giturl, data_dir, source_file),
                          'category': str(module.__class__.__name__),
                          # Template uses element_id in js function names, so can't allow dashes
-                         'element_id': module.location.html_id().replace('-','_'),
+                         'element_id': module.location.html_id().replace('-', '_'),
                          'edit_link': edit_link,
                          'user': user,
-                         'xqa_server' : settings.MITX_FEATURES.get('USE_XQA_SERVER','http://xqa:server@content-qa.mitx.mit.edu/xqa'),
+                         'xqa_server': settings.MITX_FEATURES.get('USE_XQA_SERVER', 'http://xqa:server@content-qa.mitx.mit.edu/xqa'),
                          'histogram': json.dumps(histogram),
                          'render_histogram': render_histogram,
                          'module_content': get_html(),
@@ -151,4 +154,3 @@ def add_histogram(get_html, module, user):
         return render_to_string("staff_problem_info.html", staff_context)
 
     return _get_html
-

common/lib/capa/capa/calc.py

@@ -121,9 +121,9 @@ def evaluator(variables, functions, string, cs=False):
     # confusing. They may also conflict with variables if we ever allow e.g.
     # 5R instead of 5*R
     suffixes = {'%': 0.01, 'k': 1e3, 'M': 1e6, 'G': 1e9,
-              'T': 1e12,#  'P':1e15,'E':1e18,'Z':1e21,'Y':1e24,
+              'T': 1e12,  # 'P':1e15,'E':1e18,'Z':1e21,'Y':1e24,
               'c': 1e-2, 'm': 1e-3, 'u': 1e-6,
-              'n': 1e-9, 'p': 1e-12}#  ,'f':1e-15,'a':1e-18,'z':1e-21,'y':1e-24}
+              'n': 1e-9, 'p': 1e-12}  # ,'f':1e-15,'a':1e-18,'z':1e-21,'y':1e-24}
 
     def super_float(text):
         ''' Like float, but with si extensions. 1k goes to 1000'''

common/lib/capa/capa/capa_problem.py

@@ -75,7 +75,7 @@ global_context = {'random': random,
                   'draganddrop': verifiers.draganddrop}
 
 # These should be removed from HTML output, including all subelements
-html_problem_semantics = ["codeparam", "responseparam", "answer", "script", "hintgroup", "openendedparam","openendedrubric"]
+html_problem_semantics = ["codeparam", "responseparam", "answer", "script", "hintgroup", "openendedparam", "openendedrubric"]
 
 log = logging.getLogger('mitx.' + __name__)
 
@@ -453,7 +453,7 @@ class LoncapaProblem(object):
                 exec code in context, context
             except Exception as err:
                 log.exception("Error while execing script code: " + code)
-                msg = "Error while executing script code: %s" % str(err).replace('<','&lt;')
+                msg = "Error while executing script code: %s" % str(err).replace('<', '&lt;')
                 raise responsetypes.LoncapaProblemError(msg)
             finally:
                 sys.path = original_path
@@ -502,7 +502,7 @@ class LoncapaProblem(object):
                    'id': problemtree.get('id'),
                    'feedback': {'message': msg,
                                 'hint': hint,
-                                'hintmode': hintmode,}}
+                                'hintmode': hintmode, }}
 
             input_type_cls = inputtypes.registry.get_class_for_tag(problemtree.tag)
             the_input = input_type_cls(self.system, problemtree, state)

common/lib/capa/capa/chem/__init__.py

-

common/lib/capa/capa/chem/chemcalc.py

@@ -17,17 +17,17 @@ from nltk.tree import Tree
 ARROWS = ('<->', '->')
 
 ## Defines a simple pyparsing tokenizer for chemical equations
-elements = ['Ac','Ag','Al','Am','Ar','As','At','Au','B','Ba','Be',
-            'Bh','Bi','Bk','Br','C','Ca','Cd','Ce','Cf','Cl','Cm',
-            'Cn','Co','Cr','Cs','Cu','Db','Ds','Dy','Er','Es','Eu',
-            'F','Fe','Fl','Fm','Fr','Ga','Gd','Ge','H','He','Hf',
-            'Hg','Ho','Hs','I','In','Ir','K','Kr','La','Li','Lr',
-            'Lu','Lv','Md','Mg','Mn','Mo','Mt','N','Na','Nb','Nd',
-            'Ne','Ni','No','Np','O','Os','P','Pa','Pb','Pd','Pm',
-            'Po','Pr','Pt','Pu','Ra','Rb','Re','Rf','Rg','Rh','Rn',
-            'Ru','S','Sb','Sc','Se','Sg','Si','Sm','Sn','Sr','Ta',
-            'Tb','Tc','Te','Th','Ti','Tl','Tm','U','Uuo','Uup',
-            'Uus','Uut','V','W','Xe','Y','Yb','Zn','Zr']
+elements = ['Ac', 'Ag', 'Al', 'Am', 'Ar', 'As', 'At', 'Au', 'B', 'Ba', 'Be',
+            'Bh', 'Bi', 'Bk', 'Br', 'C', 'Ca', 'Cd', 'Ce', 'Cf', 'Cl', 'Cm',
+            'Cn', 'Co', 'Cr', 'Cs', 'Cu', 'Db', 'Ds', 'Dy', 'Er', 'Es', 'Eu',
+            'F', 'Fe', 'Fl', 'Fm', 'Fr', 'Ga', 'Gd', 'Ge', 'H', 'He', 'Hf',
+            'Hg', 'Ho', 'Hs', 'I', 'In', 'Ir', 'K', 'Kr', 'La', 'Li', 'Lr',
+            'Lu', 'Lv', 'Md', 'Mg', 'Mn', 'Mo', 'Mt', 'N', 'Na', 'Nb', 'Nd',
+            'Ne', 'Ni', 'No', 'Np', 'O', 'Os', 'P', 'Pa', 'Pb', 'Pd', 'Pm',
+            'Po', 'Pr', 'Pt', 'Pu', 'Ra', 'Rb', 'Re', 'Rf', 'Rg', 'Rh', 'Rn',
+            'Ru', 'S', 'Sb', 'Sc', 'Se', 'Sg', 'Si', 'Sm', 'Sn', 'Sr', 'Ta',
+            'Tb', 'Tc', 'Te', 'Th', 'Ti', 'Tl', 'Tm', 'U', 'Uuo', 'Uup',
+            'Uus', 'Uut', 'V', 'W', 'Xe', 'Y', 'Yb', 'Zn', 'Zr']
 digits = map(str, range(10))
 symbols = list("[](){}^+-/")
 phases = ["(s)", "(l)", "(g)", "(aq)"]
@@ -252,7 +252,7 @@ def _get_final_tree(s):
     '''
     tokenized = tokenizer.parseString(s)
     parsed = parser.parse(tokenized)
-    merged = _merge_children(parsed, {'S','group'})
+    merged = _merge_children(parsed, {'S', 'group'})
     final = _clean_parse_tree(merged)
     return final
 

common/lib/capa/capa/correctmap.py

@@ -3,6 +3,7 @@
 #
 # Used by responsetypes and capa_problem
 
+
 class CorrectMap(object):
     """
     Stores map between answer_id and response evaluation result for each question
@@ -152,6 +153,3 @@ class CorrectMap(object):
         if not isinstance(other_cmap, CorrectMap):
             raise Exception('CorrectMap.update called with invalid argument %s' % other_cmap)
         self.cmap.update(other_cmap.get_dict())
-
-
-

common/lib/capa/capa/customrender.py

@@ -22,6 +22,8 @@ log = logging.getLogger('mitx.' + __name__)
 registry = TagRegistry()
 
 #-----------------------------------------------------------------------------
+
+
 class MathRenderer(object):
     tags = ['math']
 
@@ -77,6 +79,7 @@ registry.register(MathRenderer)
 
 #-----------------------------------------------------------------------------
 
+
 class SolutionRenderer(object):
     '''
     A solution is just a <span>...</span> which is given an ID, that is used for displaying an
@@ -97,4 +100,3 @@ class SolutionRenderer(object):
         return etree.XML(html)
 
 registry.register(SolutionRenderer)
-

common/lib/capa/capa/inputtypes.py

@@ -54,6 +54,7 @@ log = logging.getLogger('mitx.' + __name__)
 
 registry = TagRegistry()
 
+
 class Attribute(object):
     """
     Allows specifying required and optional attributes for input types.
@@ -413,7 +414,7 @@ class JavascriptInput(InputTypeBase):
         return [Attribute('params', None),
                 Attribute('problem_state', None),
                 Attribute('display_class', None),
-                Attribute('display_file', None),]
+                Attribute('display_file', None), ]
 
 
     def setup(self):
@@ -477,12 +478,13 @@ class TextLine(InputTypeBase):
 
     def _extra_context(self):
         return {'do_math': self.do_math,
-                'preprocessor': self.preprocessor,}
+                'preprocessor': self.preprocessor, }
 
 registry.register(TextLine)
 
 #-----------------------------------------------------------------------------
 
+
 class FileSubmission(InputTypeBase):
     """
     Upload some files (e.g. for programming assignments)
@@ -508,7 +510,7 @@ class FileSubmission(InputTypeBase):
         Convert the list of allowed files to a convenient format.
         """
         return [Attribute('allowed_files', '[]', transform=cls.parse_files),
-                Attribute('required_files', '[]', transform=cls.parse_files),]
+                Attribute('required_files', '[]', transform=cls.parse_files), ]
 
     def setup(self):
         """
@@ -524,7 +526,7 @@ class FileSubmission(InputTypeBase):
             self.msg = FileSubmission.submitted_msg
 
     def _extra_context(self):
-        return {'queue_len': self.queue_len,}
+        return {'queue_len': self.queue_len, }
         return context
 
 registry.register(FileSubmission)
@@ -582,7 +584,7 @@ class CodeInput(InputTypeBase):
 
     def _extra_context(self):
         """Defined queue_len, add it """
-        return {'queue_len': self.queue_len,}
+        return {'queue_len': self.queue_len, }
 
 registry.register(CodeInput)
 
@@ -606,7 +608,7 @@ class Schematic(InputTypeBase):
             Attribute('parts', None),
             Attribute('analyses', None),
             Attribute('initial_value', None),
-            Attribute('submit_analyses', None),]
+            Attribute('submit_analyses', None), ]
 
         return context
 
@@ -614,6 +616,7 @@ registry.register(Schematic)
 
 #-----------------------------------------------------------------------------
 
+
 class ImageInput(InputTypeBase):
     """
     Clickable image as an input field.  Element should specify the image source, height,
@@ -635,7 +638,7 @@ class ImageInput(InputTypeBase):
         """
         return [Attribute('src'),
                 Attribute('height'),
-                Attribute('width'),]
+                Attribute('width'), ]
 
 
     def setup(self):
@@ -660,6 +663,7 @@ registry.register(ImageInput)
 
 #-----------------------------------------------------------------------------
 
+
 class Crystallography(InputTypeBase):
     """
     An input for crystallography -- user selects 3 points on the axes, and we get a plane.
@@ -728,18 +732,19 @@ class ChemicalEquationInput(InputTypeBase):
         """
         Can set size of text field.
         """
-        return [Attribute('size', '20'),]
+        return [Attribute('size', '20'), ]
 
     def _extra_context(self):
         """
         TODO (vshnayder): Get rid of this once we have a standard way of requiring js to be loaded.
         """
-        return {'previewer': '/static/js/capa/chemical_equation_preview.js',}
+        return {'previewer': '/static/js/capa/chemical_equation_preview.js', }
 
 registry.register(ChemicalEquationInput)
 
 #-----------------------------------------------------------------------------
 
+
 class DragAndDropInput(InputTypeBase):
     """
     Input for drag and drop problems. Allows student to drag and drop images and

common/lib/capa/capa/responsetypes.py

@@ -186,8 +186,8 @@ class LoncapaResponse(object):
         tree = etree.Element('span')
 
         # problem author can make this span display:inline
-        if self.xml.get('inline',''):
-            tree.set('class','inline')
+        if self.xml.get('inline', ''):
+            tree.set('class', 'inline')
 
         for item in self.xml:
             # call provided procedure to do the rendering
@@ -1294,7 +1294,7 @@ class CodeResponse(LoncapaResponse):
 
         # State associated with the queueing request
         queuestate = {'key': queuekey,
-                      'time': qtime,}
+                      'time': qtime, }
 
         cmap = CorrectMap()
         if error:

common/lib/capa/capa/tests/__init__.py

@@ -8,6 +8,7 @@ import xml.sax.saxutils as saxutils
 
 TEST_DIR = os.path.dirname(os.path.realpath(__file__))
 
+
 def tst_render_template(template, context):
     """
     A test version of render to template.  Renders to the repr of the context, completely ignoring
@@ -25,7 +26,7 @@ test_system = Mock(
     user=Mock(),
     filestore=fs.osfs.OSFS(os.path.join(TEST_DIR, "test_files")),
     debug=True,
-    xqueue={'interface':None, 'callback_url':'/', 'default_queuename': 'testqueue', 'waittime': 10},
+    xqueue={'interface': None, 'callback_url': '/', 'default_queuename': 'testqueue', 'waittime': 10},
     node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules"),
-    anonymous_student_id = 'student'
+    anonymous_student_id='student'
 )

common/lib/capa/capa/tests/test_customrender.py

@@ -8,6 +8,7 @@ from capa import customrender
 # just a handy shortcut
 lookup_tag = customrender.registry.get_class_for_tag
 
+
 def extract_context(xml):
     """
     Given an xml element corresponding to the output of test_system.render_template, get back the
@@ -15,9 +16,11 @@ def extract_context(xml):
     """
     return eval(xml.text)
 
+
 def quote_attr(s):
     return saxutils.quoteattr(s)[1:-1]  # don't want the outer quotes
 
+
 class HelperTest(unittest.TestCase):
     '''
     Make sure that our helper function works!
@@ -50,7 +53,7 @@ class SolutionRenderTest(unittest.TestCase):
         # our test_system "renders" templates to a div with the repr of the context
         xml = renderer.get_html()
         context = extract_context(xml)
-        self.assertEqual(context, {'id' : 'solution_12'})
+        self.assertEqual(context, {'id': 'solution_12'})
 
 
 class MathRenderTest(unittest.TestCase):
@@ -73,4 +76,3 @@ class MathRenderTest(unittest.TestCase):
 
 
     # NOTE: not testing get_html yet because I don't understand why it's doing what it's doing.
-        

common/lib/capa/capa/tests/test_inputtypes.py

@@ -31,6 +31,7 @@ lookup_tag = inputtypes.registry.get_class_for_tag
 def quote_attr(s):
     return saxutils.quoteattr(s)[1:-1]  # don't want the outer quotes
 
+
 class OptionInputTest(unittest.TestCase):
     '''
     Make sure option inputs work
@@ -100,7 +101,7 @@ class ChoiceGroupTest(unittest.TestCase):
                     'input_type': expected_input_type,
                     'choices': [('foil1', '<text>This is foil One.</text>'),
                                 ('foil2', '<text>This is foil Two.</text>'),
-                                ('foil3', 'This is foil Three.'),],
+                                ('foil3', 'This is foil Three.'), ],
                     'name_array_suffix': expected_suffix,   # what is this for??
                     }
 
@@ -137,7 +138,7 @@ class JavascriptInputTest(unittest.TestCase):
 
         element = etree.fromstring(xml_str)
 
-        state = {'value': '3',}
+        state = {'value': '3', }
         the_input = lookup_tag('javascriptinput')(test_system, element, state)
 
         context = the_input._get_render_context()
@@ -149,7 +150,7 @@ class JavascriptInputTest(unittest.TestCase):
                     'params': params,
                     'display_file': display_file,
                     'display_class': display_class,
-                    'problem_state': problem_state,}
+                    'problem_state': problem_state, }
 
         self.assertEqual(context, expected)
 
@@ -165,7 +166,7 @@ class TextLineTest(unittest.TestCase):
 
         element = etree.fromstring(xml_str)
 
-        state = {'value': 'BumbleBee',}
+        state = {'value': 'BumbleBee', }
         the_input = lookup_tag('textline')(test_system, element, state)
 
         context = the_input._get_render_context()
@@ -193,7 +194,7 @@ class TextLineTest(unittest.TestCase):
 
         element = etree.fromstring(xml_str)
 
-        state = {'value': 'BumbleBee',}
+        state = {'value': 'BumbleBee', }
         the_input = lookup_tag('textline')(test_system, element, state)
 
         context = the_input._get_render_context()
@@ -231,7 +232,7 @@ class FileSubmissionTest(unittest.TestCase):
 
         state = {'value': 'BumbleBee.py',
                  'status': 'incomplete',
-                 'feedback' : {'message': '3'}, }
+                 'feedback': {'message': '3'}, }
         input_class = lookup_tag('filesubmission')
         the_input = input_class(test_system, element, state)
 
@@ -275,7 +276,7 @@ class CodeInputTest(unittest.TestCase):
 
         state = {'value': 'print "good evening"',
                  'status': 'incomplete',
-                 'feedback' : {'message': '3'}, }
+                 'feedback': {'message': '3'}, }
 
         input_class = lookup_tag('codeinput')
         the_input = input_class(test_system, element, state)
@@ -488,7 +489,7 @@ class ChemicalEquationTest(unittest.TestCase):
 
         element = etree.fromstring(xml_str)
 
-        state = {'value': 'H2OYeah',}
+        state = {'value': 'H2OYeah', }
         the_input = lookup_tag('chemicalequationinput')(test_system, element, state)
 
         context = the_input._get_render_context()

common/lib/capa/capa/tests/test_responsetypes.py

@@ -16,6 +16,7 @@ from capa.correctmap import CorrectMap
 from capa.util import convert_files_to_filenames
 from capa.xqueue_interface import dateformat
 
+
 class MultiChoiceTest(unittest.TestCase):
     def test_MC_grade(self):
         multichoice_file = os.path.dirname(__file__) + "/test_files/multichoice.xml"
@@ -295,16 +296,16 @@ class CodeResponseTest(unittest.TestCase):
             old_cmap = CorrectMap()
             for i, answer_id in enumerate(answer_ids):
                 queuekey = 1000 + i
-                queuestate = CodeResponseTest.make_queuestate(1000+i, datetime.now())
+                queuestate = CodeResponseTest.make_queuestate(1000 + i, datetime.now())
                 old_cmap.update(CorrectMap(answer_id=answer_ids[i], queuestate=queuestate))
 
             # Message format common to external graders
             grader_msg = '<span>MESSAGE</span>'   # Must be valid XML
-            correct_score_msg = json.dumps({'correct':True, 'score':1, 'msg': grader_msg})
-            incorrect_score_msg = json.dumps({'correct':False, 'score':0, 'msg': grader_msg})
+            correct_score_msg = json.dumps({'correct': True, 'score': 1, 'msg': grader_msg})
+            incorrect_score_msg = json.dumps({'correct': False, 'score': 0, 'msg': grader_msg})
 
             xserver_msgs = {'correct': correct_score_msg,
-                            'incorrect': incorrect_score_msg,}
+                            'incorrect': incorrect_score_msg, }
 
             # Incorrect queuekey, state should not be updated
             for correctness in ['correct', 'incorrect']:
@@ -325,7 +326,7 @@ class CodeResponseTest(unittest.TestCase):
 
                     new_cmap = CorrectMap()
                     new_cmap.update(old_cmap)
-                    npoints = 1 if correctness=='correct' else 0
+                    npoints = 1 if correctness == 'correct' else 0
                     new_cmap.set(answer_id=answer_id, npoints=npoints, correctness=correctness, msg=grader_msg, queuestate=None)
 
                     test_lcp.update_score(xserver_msgs[correctness], queuekey=1000 + i)
@@ -361,7 +362,7 @@ class CodeResponseTest(unittest.TestCase):
             for i, answer_id in enumerate(answer_ids):
                 queuekey = 1000 + i
                 latest_timestamp = datetime.now()
-                queuestate = CodeResponseTest.make_queuestate(1000+i, latest_timestamp)
+                queuestate = CodeResponseTest.make_queuestate(1000 + i, latest_timestamp)
                 cmap.update(CorrectMap(answer_id=answer_id, queuestate=queuestate))
             test_lcp.correct_map.update(cmap)
 
@@ -412,6 +413,7 @@ class ChoiceResponseTest(unittest.TestCase):
         self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_3_1'), 'incorrect')
         self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_4_1'), 'correct')
 
+
 class JavascriptResponseTest(unittest.TestCase):
 
     def test_jr_grade(self):
@@ -424,4 +426,3 @@ class JavascriptResponseTest(unittest.TestCase):
 
         self.assertEquals(test_lcp.grade_answers(incorrect_answers).get_correctness('1_2_1'), 'incorrect')
         self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct')
-

common/lib/capa/capa/util.py

@@ -57,9 +57,11 @@ def convert_files_to_filenames(answers):
             new_answers[answer_id] = answers[answer_id]
     return new_answers
 
+
 def is_list_of_files(files):
     return isinstance(files, list) and all(is_file(f) for f in files)
 
+
 def is_file(file_to_test):
     '''
     Duck typing to check if 'file_to_test' is a File object
@@ -86,4 +88,3 @@ def find_with_default(node, path, default):
         return v.text
     else:
         return default
-

common/lib/capa/capa/xqueue_interface.py

@@ -10,6 +10,7 @@ import requests
 log = logging.getLogger('mitx.' + __name__)
 dateformat = '%Y%m%d%H%M%S'
 
+
 def make_hashkey(seed):
     '''
     Generate a string key by hashing
@@ -29,9 +30,9 @@ def make_xheader(lms_callback_url, lms_key, queue_name):
           'queue_name': designate a specific queue within xqueue server, e.g. 'MITx-6.00x' (string)
         }
     """
-    return json.dumps({ 'lms_callback_url': lms_callback_url,
+    return json.dumps({'lms_callback_url': lms_callback_url,
                         'lms_key': lms_key,
-                        'queue_name': queue_name })
+                        'queue_name': queue_name})
 
 
 def parse_xreply(xreply):
@@ -96,18 +97,18 @@ class XQueueInterface(object):
 
 
     def _login(self):
-        payload = { 'username': self.auth['username'],
-                    'password': self.auth['password'] }
+        payload = {'username': self.auth['username'],
+                    'password': self.auth['password']}
         return self._http_post(self.url + '/xqueue/login/', payload)
 
 
     def _send_to_queue(self, header, body, files_to_upload):
         payload = {'xqueue_header': header,
-                   'xqueue_body'  : body}
+                   'xqueue_body': body}
         files = {}
         if files_to_upload is not None:
             for f in files_to_upload:
-                files.update({ f.name: f })
+                files.update({f.name: f})
 
         return self._http_post(self.url + '/xqueue/submit/', payload, files=files)
 

common/lib/supertrace.py

@@ -3,7 +3,8 @@ A handy util to print a django-debug-screen-like stack trace with
 values of local variables.
 """
 
-import sys, traceback
+import sys
+import traceback
 from django.utils.encoding import smart_unicode
 
 
@@ -48,5 +49,3 @@ def supertrace(max_len=160):
                 print s
             except:
                 print "<ERROR WHILE PRINTING VALUE>"
-
-

common/lib/xmodule/xmodule/capa_module.py

@@ -29,6 +29,7 @@ TIMEDELTA_REGEX = re.compile(r'^((?P<days>\d+?) day(?:s?))?(\s)?((?P<hours>\d+?)
 # Generated this many different variants of problems with rerandomize=per_student
 NUM_RANDOMIZATION_BINS = 20
 
+
 def randomization_bin(seed, problem_id):
     """
     Pick a randomization bin for the problem given the user's seed and a problem id.
@@ -43,6 +44,7 @@ def randomization_bin(seed, problem_id):
     # get the first few digits of the hash, convert to an int, then mod.
     return int(h.hexdigest()[:7], 16) % NUM_RANDOMIZATION_BINS
 
+
 def only_one(lst, default="", process=lambda x: x):
     """
     If lst is empty, returns default
@@ -315,7 +317,7 @@ class CapaModule(XModule):
         # check button is context-specific.
 
         # Put a "Check" button if unlimited attempts or still some left
-        if self.max_attempts is None or self.attempts < self.max_attempts-1:
+        if self.max_attempts is None or self.attempts < self.max_attempts - 1:
             check_button = "Check"
         else:
             # Will be final check so let user know that
@@ -561,7 +563,7 @@ class CapaModule(XModule):
             current_time = datetime.datetime.now()
             prev_submit_time = self.lcp.get_recentmost_queuetime()
             waittime_between_requests = self.system.xqueue['waittime']
-            if (current_time-prev_submit_time).total_seconds() < waittime_between_requests:
+            if (current_time - prev_submit_time).total_seconds() < waittime_between_requests:
                 msg = 'You must wait at least %d seconds between submissions' % waittime_between_requests
                 return {'success': msg, 'html': ''}   # Prompts a modal dialog in ajax callback
 
@@ -596,7 +598,7 @@ class CapaModule(XModule):
 	event_info['attempts'] = self.attempts
         self.system.track_function('save_problem_check', event_info)
 
-	if hasattr(self.system,'psychometrics_handler'):	# update PsychometricsData using callback
+	if hasattr(self.system, 'psychometrics_handler'):  	# update PsychometricsData using callback
 		self.system.psychometrics_handler(self.get_instance_state())
 
         # render problem into HTML
@@ -707,7 +709,7 @@ class CapaDescriptor(RawDescriptor):
     @property
     def editable_metadata_fields(self):
         """Remove metadata from the editable fields since it has its own editor"""
-        subset = super(CapaDescriptor,self).editable_metadata_fields
+        subset = super(CapaDescriptor, self).editable_metadata_fields
         if 'markdown' in subset:
             subset.remove('markdown')
         return subset

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -51,14 +51,10 @@ ACCEPT_FILE_UPLOAD = False
 TRUE_DICT = ["True", True, "TRUE", "true"]
 
 HUMAN_TASK_TYPE = {
-    'selfassessment' : "Self Assessment",
-    'openended' : "External Grader",
+    'selfassessment': "Self Assessment",
+    'openended': "External Grader",
 }
 
-class IncorrectMaxScoreError(Exception):
-    def __init__(self, msg):
-        self.msg = msg
-
 class CombinedOpenEndedModule(XModule):
     """
     This is a module that encapsulates all open ended grading (self assessment, peer assessment, etc).
@@ -179,15 +175,10 @@ class CombinedOpenEndedModule(XModule):
         # completion (doesn't matter if you self-assessed correct/incorrect).
         self._max_score = int(self.metadata.get('max_score', MAX_SCORE))
 
-        if self._max_score > MAX_SCORE_ALLOWED:
-            error_message = "Max score {0} is higher than max score allowed {1} for location {2}".format(self._max_score,
-                MAX_SCORE_ALLOWED, location)
-            log.error(error_message)
-            raise IncorrectMaxScoreError(error_message)
 
         rubric_renderer = CombinedOpenEndedRubric(system, True)
         rubric_string = stringify_children(definition['rubric'])
-        rubric_renderer.check_if_rubric_is_parseable(rubric_string, location, MAX_SCORE_ALLOWED)
+        rubric_renderer.check_if_rubric_is_parseable(rubric_string, location, MAX_SCORE_ALLOWED, self._max_score)
 
         #Static data is passed to the child modules to render
         self.static_data = {

common/lib/xmodule/xmodule/combined_open_ended_rubric.py

 import logging
 from lxml import etree
 
-log=logging.getLogger(__name__)
+log = logging.getLogger(__name__)
+
 
 class RubricParsingError(Exception):
     def __init__(self, msg):
         self.msg = msg
 
+
 class CombinedOpenEndedRubric(object):
 
     def __init__ (self, system, view_only = False):
@@ -27,10 +29,13 @@ class CombinedOpenEndedRubric(object):
         success = False
         try:
             rubric_categories = self.extract_categories(rubric_xml)
+            max_scores = map((lambda cat: cat['options'][-1]['points']), rubric_categories)
+            max_score = max(max_scores)
             html = self.system.render_template('open_ended_rubric.html', 
-                    {'categories'  : rubric_categories,
+                    {'categories': rubric_categories,
                      'has_score': self.has_score,
-                     'view_only': self.view_only})
+                     'view_only': self.view_only,
+                     'max_score': max_score})
             success = True
         except:
             error_message = "[render_rubric] Could not parse the rubric with xml: {0}".format(rubric_xml)
@@ -38,7 +43,7 @@ class CombinedOpenEndedRubric(object):
             raise RubricParsingError(error_message)
         return success, html
 
-    def check_if_rubric_is_parseable(self, rubric_string, location, max_score_allowed):
+    def check_if_rubric_is_parseable(self, rubric_string, location, max_score_allowed, max_score):
         success, rubric_feedback = self.render_rubric(rubric_string)
         if not success:
             error_message = "Could not parse rubric : {0} for location {1}".format(rubric_string, location.url())
@@ -46,13 +51,21 @@ class CombinedOpenEndedRubric(object):
             raise RubricParsingError(error_message)
 
         rubric_categories = self.extract_categories(rubric_string)
+        total = 0
         for category in rubric_categories:
+            total = total + len(category['options']) - 1
             if len(category['options']) > (max_score_allowed + 1):
                 error_message = "Number of score points in rubric {0} higher than the max allowed, which is {1}".format(
                     len(category['options']), max_score_allowed)
                 log.error(error_message)
                 raise RubricParsingError(error_message)
 
+        if total != max_score:
+            error_msg = "The max score {0} for problem {1} does not match the total number of points in the rubric {2}".format(
+                    max_score, location, total)
+            log.error(error_msg)
+            raise RubricParsingError(error_msg)
+
     def extract_categories(self, element):
         '''
         Contstruct a list of categories such that the structure looks like:

common/lib/xmodule/xmodule/conditional_module.py

@@ -9,6 +9,7 @@ from pkg_resources import resource_string
 
 log = logging.getLogger('mitx.' + __name__)
 
+
 class ConditionalModule(XModule):
     '''
     Blocks child module from showing unless certain conditions are met.
@@ -43,7 +44,7 @@ class ConditionalModule(XModule):
         """
         XModule.__init__(self, system, location, definition, descriptor, instance_state, shared_state, **kwargs)
         self.contents = None
-        self.condition = self.metadata.get('condition','')
+        self.condition = self.metadata.get('condition', '')
         #log.debug('conditional module required=%s' % self.required_modules_list)
 
     def _get_required_modules(self):
@@ -56,7 +57,7 @@ class ConditionalModule(XModule):
     def is_condition_satisfied(self):
         self._get_required_modules()
 
-        if self.condition=='require_completed':
+        if self.condition == 'require_completed':
             # all required modules must be completed, as determined by
             # the modules .is_completed() method
             for module in self.required_modules:
@@ -70,7 +71,7 @@ class ConditionalModule(XModule):
                 else:
                     log.debug('conditional module: %s IS completed' % module)
             return True
-        elif self.condition=='require_attempted':
+        elif self.condition == 'require_attempted':
             # all required modules must be attempted, as determined by
             # the modules .is_attempted() method
             for module in self.required_modules:
@@ -114,6 +115,7 @@ class ConditionalModule(XModule):
 
         return json.dumps({'html': html})
 
+
 class ConditionalDescriptor(SequenceDescriptor):
     module_class = ConditionalModule
 
@@ -125,7 +127,7 @@ class ConditionalDescriptor(SequenceDescriptor):
     def __init__(self, *args, **kwargs):
         super(ConditionalDescriptor, self).__init__(*args, **kwargs)
 
-        required_module_list = [tuple(x.split('/',1)) for x in self.metadata.get('required','').split('&')]
+        required_module_list = [tuple(x.split('/', 1)) for x in self.metadata.get('required', '').split('&')]
         self.required_module_locations = []
         for (tag, name) in required_module_list:
             loc = self.location.dict()
@@ -138,4 +140,3 @@ class ConditionalDescriptor(SequenceDescriptor):
         """Returns a list of XModuleDescritpor instances upon which this module depends, but are
         not children of this module"""
         return [self.system.load_item(loc) for loc in self.required_module_locations]
-    

common/lib/xmodule/xmodule/contentstore/content.py

@@ -11,10 +11,11 @@ from xmodule.modulestore import Location
 from .django import contentstore
 from PIL import Image
 
+
 class StaticContent(object):
     def __init__(self, loc, name, content_type, data, last_modified_at=None, thumbnail_location=None, import_path=None):
         self.location = loc
-        self.name = name #a display string which can be edited, and thus not part of the location which needs to be fixed
+        self.name = name   # a display string which can be edited, and thus not part of the location which needs to be fixed
         self.content_type = content_type
         self.data = data
         self.last_modified_at = last_modified_at
@@ -29,7 +30,7 @@ class StaticContent(object):
 
     @staticmethod
     def generate_thumbnail_name(original_name):
-        return ('{0}'+XASSET_THUMBNAIL_TAIL_NAME).format(os.path.splitext(original_name)[0])
+        return ('{0}' + XASSET_THUMBNAIL_TAIL_NAME).format(os.path.splitext(original_name)[0])
 
     @staticmethod
     def compute_location(org, course, name, revision=None, is_thumbnail=False):
@@ -56,9 +57,9 @@ class StaticContent(object):
 
     @staticmethod
     def get_id_from_location(location):
-        return { 'tag':location.tag, 'org' : location.org, 'course' : location.course,
-                   'category' : location.category, 'name' : location.name, 
-                   'revision' : location.revision}
+        return {'tag': location.tag, 'org': location.org, 'course': location.course,
+                   'category': location.category, 'name': location.name, 
+                   'revision': location.revision}
     @staticmethod
     def get_location_from_path(path):
         # remove leading / character if it is there one
@@ -117,7 +118,7 @@ class ContentStore(object):
         thumbnail_name = StaticContent.generate_thumbnail_name(content.location.name)
 
         thumbnail_file_location = StaticContent.compute_location(content.location.org, content.location.course,
-            thumbnail_name, is_thumbnail = True)
+            thumbnail_name, is_thumbnail=True)
 
         # if we're uploading an image, then let's generate a thumbnail so that we can
         # serve it up when needed without having to rescale on the fly
@@ -149,7 +150,3 @@ class ContentStore(object):
                 logging.exception("Failed to generate thumbnail for {0}. Exception: {1}".format(content.location, str(e)))
 
         return thumbnail_content, thumbnail_file_location
-
-
-
-