Exception, err -> Exception as err

common/lib/capa/capa_problem.py

@@ -255,7 +255,7 @@ class LoncapaProblem(object):
             if file is not None:
                 try:
                     ifp = self.system.filestore.open(file)	# open using I4xSystem OSFS filestore
-                except Exception,err:
+                except Exception as err:
                     log.error('Error %s in problem xml include: %s' % (err,etree.tostring(inc,pretty_print=True)))
                     log.error('Cannot find file %s in %s' % (file,self.system.filestore))
                     if not self.system.get('DEBUG'):		# if debugging, don't fail - just log error
@@ -263,7 +263,7 @@ class LoncapaProblem(object):
                     else: continue
                 try:
                     incxml = etree.XML(ifp.read())		# read in and convert to XML
-                except Exception,err:
+                except Exception as err:
                     log.error('Error %s in problem xml include: %s' % (err,etree.tostring(inc,pretty_print=True)))
                     log.error('Cannot parse XML in %s' % (file))
                     if not self.system.get('DEBUG'):		# if debugging, don't fail - just log error

common/lib/capa/responsetypes.py

@@ -193,7 +193,7 @@ class LoncapaResponse(object):
 
             try:
                 self.context[hintfn](self.answer_ids, student_answers, new_cmap, old_cmap)
-            except Exception, err:
+            except Exception as err:
                 msg = 'Error %s in evaluating hint function %s' % (err,hintfn)
                 msg += "\nSee XML source line %s" % getattr(self.xml,'sourceline','<unavailable>')
                 raise ResponseError(msg)
@@ -556,7 +556,7 @@ def sympy_check2():
         idset = sorted(self.answer_ids)				# ordered list of answer id's
         try:
             submission = [student_answers[k] for k in idset]	# ordered list of answers
-        except Exception, err:
+        except Exception as err:
             msg = '[courseware.capa.responsetypes.customresponse] error getting student answer from %s' % student_answers
             msg += '\n idset = %s, error = %s' % (idset,err)
             log.error(msg)
@@ -594,7 +594,7 @@ def sympy_check2():
         if type(self.code)==str:
             try:
                 exec self.code in self.context['global_context'], self.context
-            except Exception,err:
+            except Exception as err:
                 print "oops in customresponse (code) error %s" % err
                 print "context = ",self.context
                 print traceback.format_exc()
@@ -619,7 +619,7 @@ def sympy_check2():
                 log.debug('nargs=%d, args=%s, kwargs=%s' % (nargs,args,kwargs))
 
                 ret = fn(*args[:nargs],**kwargs)
-            except Exception,err:
+            except Exception as err:
                 log.error("oops in customresponse (cfn) error %s" % err)
                 # print "context = ",self.context
                 log.error(traceback.format_exc())
@@ -782,7 +782,7 @@ main()
 
         try:
             r = requests.post(self.url,data=payload)          # call external server
-        except Exception,err:
+        except Exception as err:
             msg = 'Error %s - cannot connect to external server url=%s' % (err,self.url)
             log.error(msg)
             raise Exception(msg)
@@ -794,7 +794,7 @@ main()
 
         try:
             rxml = etree.fromstring(r.text)         # response is XML; prase it
-        except Exception,err:
+        except Exception as err:
             msg = 'Error %s - cannot parse response from external server r.text=%s' % (err,r.text)
             log.error(msg)
             raise Exception(msg)
@@ -806,7 +806,7 @@ main()
         cmap = CorrectMap()
         try:
             submission = [student_answers[k] for k in idset]
-        except Exception,err:
+        except Exception as err:
             log.error('Error %s: cannot get student answer for %s; student_answers=%s' % (err,self.answer_ids,student_answers))
             raise Exception(err)
 
@@ -816,7 +816,7 @@ main()
 
         try:
             rxml = self.do_external_request('get_score',extra_payload)
-        except Exception, err:
+        except Exception as err:
             log.error('Error %s' % err)
             if self.system.DEBUG:
                 cmap.set_dict(dict(zip(sorted(self.answer_ids), ['incorrect'] * len(idset) )))
@@ -846,7 +846,7 @@ main()
         try:
             rxml = self.do_external_request('get_answers',{})
             exans = json.loads(rxml.find('expected').text)
-        except Exception,err:
+        except Exception as err:
             log.error('Error %s' % err)
             if self.system.DEBUG:
                 msg = '<font color=red size=+2>%s</font>' % str(err).replace('<','&lt;')
@@ -943,7 +943,7 @@ class FormulaResponse(LoncapaResponse):
             except UndefinedVariable as uv:
                 log.debug('formularesponse: undefined variable in given=%s' % given)
                 raise StudentInputError(uv.message+" not permitted in answer")
-            except Exception, err:
+            except Exception as err:
                 #traceback.print_exc()
                 log.debug('formularesponse: error %s in formula' % err)
                 raise StudentInputError("Error in formula")