Merge remote-tracking branch 'origin/dogfood' into dogfood

djangoapps/courseware/modules/capa_module.py

@@ -199,18 +199,18 @@ class Module(XModule):
         try:
             fp = self.filestore.open(self.filename)
         except Exception,err:
-            log.error('[courseware.capa.capa_module.Module.init] error %s: cannot open file %s' % (err,self.filename))
+            log.exception('[courseware.capa.capa_module.Module.init] error %s: cannot open file %s' % (err,self.filename))
             if self.DEBUG:
                 # create a dummy problem instead of failing
                 fp = StringIO.StringIO('<problem><text><font color="red" size="+2">Problem file %s is missing</font></text></problem>' % self.filename)
                 fp.name = "StringIO"
             else:
-                raise Exception,err
+                raise
         try:
             self.lcp=LoncapaProblem(fp, self.item_id, state, seed = seed, system=self.system)
         except Exception,err:
             msg = '[courseware.capa.capa_module.Module.init] error %s: cannot create LoncapaProblem %s' % (err,self.filename)
-            log.error(msg)
+            log.exception(msg)
             if self.DEBUG:
                 msg = '<p>%s</p>' % msg.replace('<','&lt;')
                 msg += '<p><pre>%s</pre></p>' % traceback.format_exc().replace('<','&lt;')
@@ -219,7 +219,7 @@ class Module(XModule):
                 fp.name = "StringIO"
                 self.lcp=LoncapaProblem(fp, self.item_id, state, seed = seed, system=self.system)
             else:
-                raise Exception,err
+                raise
 
     def handle_ajax(self, dispatch, get):
         '''
@@ -351,7 +351,7 @@ class Module(XModule):
         try:
             html = self.get_problem_html(encapsulate=False)
         except Exception,err:
-            log.error('failed to generate html, error %s' % err)
+            log.error('failed to generate html')
             raise Exception,err
 
         return json.dumps({'success': success,