more drive by violation fixes

common/lib/xmodule/xmodule/abtest_module.py

@@ -6,7 +6,7 @@ from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
 from xmodule.xml_module import XmlDescriptor
 from xmodule.exceptions import InvalidDefinitionError
-from xblock.core import String, Scope, Object, BlockScope
+from xblock.core import String, Scope, Object
 
 DEFAULT = "_DEFAULT_GROUP"
 

common/lib/xmodule/xmodule/annotatable_module.py

 import logging
 
 from lxml import etree
-from pkg_resources import resource_string, resource_listdir
+from pkg_resources import resource_string
 
 from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
-from xmodule.contentstore.content import StaticContent
 from xblock.core import Scope, String
 
 log = logging.getLogger(__name__)
@@ -25,7 +24,6 @@ class AnnotatableModule(AnnotatableFields, XModule):
     css = {'scss': [resource_string(__name__, 'css/annotatable/display.scss')]}
     icon_class = 'annotatable'
 
-
     def __init__(self, *args, **kwargs):
         XModule.__init__(self, *args, **kwargs)
 

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -219,5 +219,5 @@ class CombinedOpenEndedDescriptor(CombinedOpenEndedFields, RawDescriptor):
 
     stores_state = True
     has_score = True
-    always_recalculate_grades=True
+    always_recalculate_grades = True
     template_dir_name = "combinedopenended"

common/lib/xmodule/xmodule/conditional_module.py

@@ -10,7 +10,7 @@ from pkg_resources import resource_string
 from xmodule.x_module import XModule
 from xmodule.modulestore import Location
 from xmodule.seq_module import SequenceDescriptor
-from xblock.core import String, Scope, List
+from xblock.core import Scope, List
 from xmodule.modulestore.exceptions import ItemNotFoundError
 
 
@@ -60,7 +60,6 @@ class ConditionalModule(ConditionalFields, XModule):
     js = {'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee'),
                      resource_string(__name__, 'js/src/conditional/display.coffee'),
                      resource_string(__name__, 'js/src/collapsible.coffee'),
-
                      ]}
 
     js_module_name = "Conditional"
@@ -82,8 +81,7 @@ class ConditionalModule(ConditionalFields, XModule):
             xml_value = self.descriptor.xml_attributes.get(xml_attr)
             if xml_value:
                 return xml_value, attr_name
-        raise Exception('Error in conditional module: unknown condition "%s"'
-            % xml_attr)
+        raise Exception('Error in conditional module: unknown condition "%s"' % xml_attr)
 
     def is_condition_satisfied(self):
         self.required_modules = [self.system.get_module(descriptor) for
@@ -163,7 +161,6 @@ class ConditionalDescriptor(ConditionalFields, SequenceDescriptor):
     stores_state = True
     has_score = False
 
-
     @staticmethod
     def parse_sources(xml_element, system, return_descriptor=False):
         """Parse xml_element 'sources' attr and:

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

@@ -62,6 +62,7 @@ class StaticContent(object):
         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
@@ -80,8 +81,6 @@ class StaticContent(object):
         return StaticContent.get_url_path_from_location(loc)
 
 
-
-
 class ContentStore(object):
     '''
     Abstraction for all ContentStore providers (e.g. MongoDB)

common/lib/xmodule/xmodule/contentstore/django.py

 from __future__ import absolute_import
 from importlib import import_module
-from os import environ
 
 from django.conf import settings
 

common/lib/xmodule/xmodule/contentstore/mongo.py

@@ -6,7 +6,6 @@ from gridfs.errors import NoFile
 from xmodule.modulestore.mongo import location_to_query, Location
 from xmodule.contentstore.content import XASSET_LOCATION_TAG
 
-import sys
 import logging
 
 from .content import StaticContent, ContentStore
@@ -26,7 +25,6 @@ class MongoContentStore(ContentStore):
         self.fs = gridfs.GridFS(_db)
         self.fs_files = _db["fs.files"]   # the underlying collection GridFS uses
 
-
     def save(self, content):
         id = content.get_id()
 
@@ -34,7 +32,8 @@ class MongoContentStore(ContentStore):
         self.delete(id)
 
         with self.fs.new_file(_id=id, filename=content.get_url_path(), content_type=content.content_type,
-            displayname=content.name, thumbnail_location=content.thumbnail_location, import_path=content.import_path) as fp:
+                              displayname=content.name, thumbnail_location=content.thumbnail_location,
+                              import_path=content.import_path) as fp:
 
             fp.write(content.data)
 
@@ -49,7 +48,8 @@ class MongoContentStore(ContentStore):
         try:
             with self.fs.get(id) as fp:
                 return StaticContent(location, fp.displayname, fp.content_type, fp.read(),
-                    fp.uploadDate, thumbnail_location=fp.thumbnail_location if hasattr(fp, 'thumbnail_location') else None,
+                                     fp.uploadDate,
+                                     thumbnail_location=fp.thumbnail_location if hasattr(fp, 'thumbnail_location') else None,
                                      import_path=fp.import_path if hasattr(fp, 'import_path') else None)
         except NoFile:
             raise NotFoundError()

common/lib/xmodule/xmodule/course_module.py

@@ -211,7 +211,6 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
 
     template_dir_name = 'course'
 
-
     def __init__(self, *args, **kwargs):
         super(CourseDescriptor, self).__init__(*args, **kwargs)
 
@@ -421,7 +420,6 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
         policy['GRADE_CUTOFFS'] = value
         self.grading_policy = policy
 
-
     @property
     def lowest_passing_grade(self):
         return min(self._grading_policy['GRADE_CUTOFFS'].values())
@@ -460,7 +458,6 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
         else:
             return self.cohort_config.get("auto_cohort_groups", [])
 
-
     @property
     def top_level_discussion_topic_ids(self):
         """
@@ -469,7 +466,6 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
         topics = self.discussion_topics
         return [d["id"] for d in topics.values()]
 
-
     @property
     def cohorted_discussions(self):
         """
@@ -483,8 +479,6 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
 
         return set(config.get("cohorted_discussions", []))
 
-
-
     @property
     def is_newish(self):
         """
@@ -585,7 +579,6 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
                     yield module_descriptor
 
         for c in self.get_children():
-            sections = []
             for s in c.get_children():
                 if s.lms.graded:
                     xmoduledescriptors = list(yield_descriptor_descendents(s))
@@ -603,7 +596,6 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
         return {'graded_sections': graded_sections,
                 'all_descriptors': all_descriptors, }
 
-
     @staticmethod
     def make_id(org, course, url_name):
         return '/'.join([org, course, url_name])

common/lib/xmodule/xmodule/discussion_module.py

-from lxml import etree
-from pkg_resources import resource_string, resource_listdir
+from pkg_resources import resource_string
 
 from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
@@ -21,7 +20,6 @@ class DiscussionModule(DiscussionFields, XModule):
           }
     js_module_name = "InlineDiscussion"
 
-
     def get_html(self):
         context = {
             'discussion_id': self.discussion_id,

common/lib/xmodule/xmodule/exceptions.py

 class InvalidDefinitionError(Exception):
     pass
 
+
 class NotFoundError(Exception):
     pass
 
+
 class ProcessingError(Exception):
     '''
     An error occurred while processing a request to the XModule.

common/lib/xmodule/xmodule/fields.py

@@ -51,6 +51,8 @@ class Date(ModelType):
 
 
 TIMEDELTA_REGEX = re.compile(r'^((?P<days>\d+?) day(?:s?))?(\s)?((?P<hours>\d+?) hour(?:s?))?(\s)?((?P<minutes>\d+?) minute(?:s)?)?(\s)?((?P<seconds>\d+?) second(?:s)?)?$')
+
+
 class Timedelta(ModelType):
     def from_json(self, time_str):
         """

common/lib/xmodule/xmodule/foldit_module.py

@@ -149,7 +149,6 @@ class FolditModule(FolditFields, XModule):
         return 1
 
 
-
 class FolditDescriptor(FolditFields, XmlDescriptor, EditingDescriptor):
     """
     Module for adding Foldit problems to courses

common/lib/xmodule/xmodule/modulestore/django.py

@@ -6,7 +6,6 @@ Passes settings.MODULESTORE as kwargs to MongoModuleStore
 
 from __future__ import absolute_import
 from importlib import import_module
-from os import environ
 
 from django.conf import settings
 

common/lib/xmodule/xmodule/modulestore/inheritance.py

@@ -12,6 +12,7 @@ INHERITABLE_METADATA = (
     'giturl'  # for git edit link
 )
 
+
 def compute_inherited_metadata(descriptor):
     """Given a descriptor, traverse all of its descendants and do metadata
     inheritance.  Should be called on a CourseDescriptor after importing a

common/lib/xmodule/xmodule/modulestore/mongo.py

@@ -7,7 +7,6 @@ from collections import namedtuple
 from fs.osfs import OSFS
 from itertools import repeat
 from path import path
-from datetime import datetime
 from operator import attrgetter
 from uuid import uuid4
 
@@ -31,11 +30,13 @@ log = logging.getLogger(__name__)
 # there is only one revision for each item. Once we start versioning inside the CMS,
 # that assumption will have to change
 
+
 def get_course_id_no_run(location):
     '''
     '''
     return "/".join([location.org, location.course])
 
+
 class MongoKeyValueStore(KeyValueStore):
     """
     A KeyValueStore that maps keyed data access to one of the 3 data areas
@@ -130,8 +131,8 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
         render_template: a function for rendering templates, as per
             MakoDescriptorSystem
         """
-        super(CachingDescriptorSystem, self).__init__(
-                self.load_item, resources_fs, error_tracker, render_template)
+        super(CachingDescriptorSystem, self).__init__(self.load_item, resources_fs,
+                                                      error_tracker, render_template)
         self.modulestore = modulestore
         self.module_data = module_data
         self.default_class = default_class
@@ -140,7 +141,6 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
         self.course_id = None
         self.cached_metadata = cached_metadata
 
-
     def load_item(self, location):
         """
         Return an XModule instance for the specified location
@@ -468,7 +468,7 @@ class MongoModuleStore(ModuleStoreBase):
         # if we are loading a course object, if we're not prefetching children (depth != 0) then don't
         # bother with the metadata inheritance
         return [self._load_item(item, data_cache,
-            apply_cached_metadata=(item['location']['category']!='course' or depth !=0)) for item in items]
+                apply_cached_metadata=(item['location']['category'] != 'course' or depth != 0)) for item in items]
 
     def get_courses(self):
         '''
@@ -710,10 +710,9 @@ class MongoModuleStore(ModuleStoreBase):
             course.tabs = [tab for tab in existing_tabs if tab.get('url_slug') != location.name]
             self.update_metadata(course.location, own_metadata(course))
 
-        self.collection.remove({'_id': Location(location).dict()},
         # Must include this to avoid the django debug toolbar (which defines the deprecated "safe=False")
         # from overriding our default value set in the init method.
-            safe=self.collection.safe)
+        self.collection.remove({'_id': Location(location).dict()}, safe=self.collection.safe)
         # recompute (and update) the metadata inheritance tree which is cached
         self.refresh_cached_metadata_inheritance_tree(Location(location))
         self.fire_updated_modulestore_signal(get_course_id_no_run(Location(location)), Location(location))

common/lib/xmodule/xmodule/modulestore/search.py

@@ -3,7 +3,7 @@ from itertools import repeat
 from xmodule.course_module import CourseDescriptor
 
 from .exceptions import (ItemNotFoundError, NoPathToItem)
-from . import ModuleStore, Location
+from . import Location
 
 
 def path_to_location(modulestore, course_id, location):

common/lib/xmodule/xmodule/modulestore/store_utilities.py

-import logging
 from xmodule.contentstore.content import StaticContent
 from xmodule.modulestore import Location
 from xmodule.modulestore.mongo import MongoModuleStore
@@ -94,7 +93,7 @@ def clone_course(modulestore, contentstore, source_location, dest_location, dele
     return True
 
 
-def delete_course(modulestore, contentstore, source_location, commit = False):
+def delete_course(modulestore, contentstore, source_location, commit=False):
     # first check to see if the modulestore is Mongo backed
     if not isinstance(modulestore, MongoModuleStore):
         raise Exception("Expected a MongoModuleStore in the runtime. Aborting....")

common/lib/xmodule/xmodule/modulestore/xml.py

@@ -169,7 +169,6 @@ class ImportSystem(XMLParsingSystem, MakoDescriptorSystem):
                 # Didn't load properly.  Fall back on loading as an error
                 # descriptor.  This should never error due to formatting.
 
-
                 msg = "Error loading from xml. " + str(err)[:200]
                 log.warning(msg)
                 # Normally, we don't want lots of exception traces in our logs from common
@@ -376,10 +375,10 @@ class XMLModuleStore(ModuleStoreBase):
 
             if course is None:
                 msg = ("No 'course' attribute set for course in {dir}."
-                          " Using default '{default}'".format(
-                        dir=course_dir,
+                       " Using default '{default}'".format(dir=course_dir,
                                                            default=course_dir
-                        ))
+                                                           )
+                       )
                 log.warning(msg)
                 tracker(msg)
                 course = course_dir
@@ -445,7 +444,6 @@ class XMLModuleStore(ModuleStoreBase):
             log.debug('========> Done with course import from {0}'.format(course_dir))
             return course_descriptor
 
-
     def load_extra_content(self, system, course_descriptor, category, base_dir, course_dir, url_name):
         self._load_extra_content(system, course_descriptor, category, base_dir, course_dir)
 
@@ -453,7 +451,6 @@ class XMLModuleStore(ModuleStoreBase):
         if os.path.isdir(base_dir / url_name):
             self._load_extra_content(system, course_descriptor, category, base_dir / url_name, course_dir)
 
-
     def _load_extra_content(self, system, course_descriptor, category, path, course_dir):
 
         for filepath in glob.glob(path / '*'):
@@ -480,7 +477,6 @@ class XMLModuleStore(ModuleStoreBase):
                     logging.exception("Failed to load {0}. Skipping... Exception: {1}".format(filepath, str(e)))
                     system.error_tracker("ERROR: " + str(e))
 
-
     def get_instance(self, course_id, location, depth=0):
         """
         Returns an XModuleDescriptor instance for the item at
@@ -542,7 +538,6 @@ class XMLModuleStore(ModuleStoreBase):
 
         return items
 
-
     def get_courses(self, depth=0):
         """
         Returns a list of course descriptors.  If there were errors on loading,
@@ -567,7 +562,6 @@ class XMLModuleStore(ModuleStoreBase):
         """
         raise NotImplementedError("XMLModuleStores are read-only")
 
-
     def update_children(self, location, children):
         """
         Set the children for the item specified by the location to
@@ -578,7 +572,6 @@ class XMLModuleStore(ModuleStoreBase):
         """
         raise NotImplementedError("XMLModuleStores are read-only")
 
-
     def update_metadata(self, location, metadata):
         """
         Set the metadata for the item specified by the location to

common/lib/xmodule/xmodule/util/decorators.py

@@ -28,6 +28,7 @@ def lazyproperty(fn):
     """
 
     attr_name = '_lazy_' + fn.__name__
+
     @property
     def _lazyprop(self):
         if not hasattr(self, attr_name):