Merge branch 'master' of github.com:MITx/mitx into discussion

.pylintrc

@@ -33,7 +33,7 @@ load-plugins=
 # can either give multiple identifier separated by comma (,) or put this option
 # multiple time (only on the command line, not in the configuration file where
 # it should appear only once).
-#disable=
+disable=E1102,W0142
 
 
 [REPORTS]
@@ -82,7 +82,7 @@ zope=no
 # List of members which are set dynamically and missed by pylint inference
 # system, and so shouldn't trigger E0201 when accessed. Python regular
 # expressions are accepted.
-generated-members=REQUEST,acl_users,aq_parent
+generated-members=REQUEST,acl_users,aq_parent,objects,DoesNotExist,can_read,can_write,get_url,size
 
 
 [BASIC]

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

@@ -53,8 +53,9 @@ class XMLModuleStore(ModuleStore):
             class_ = getattr(import_module(module_path), class_name)
             self.default_class = class_
 
-        log.debug('XMLModuleStore: eager=%s, data_dir = %s' % (eager, self.data_dir))
-        log.debug('default_class = %s' % self.default_class)
+        # TODO (cpennington): We need a better way of selecting specific sets of debug messages to enable. These were drowning out important messages
+        #log.debug('XMLModuleStore: eager=%s, data_dir = %s' % (eager, self.data_dir))
+        #log.debug('default_class = %s' % self.default_class)
 
         for course_dir in os.listdir(self.data_dir):
             if course_dirs is not None and course_dir not in course_dirs: