diff --git a/.gitignore b/.gitignore index 295307932f..f98fdf7bf9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ db.newaskbot db.oldaskbot flushdb.sh build +\#*\# \ No newline at end of file diff --git a/djangoapps/courseware/capa/responsetypes.py b/djangoapps/courseware/capa/responsetypes.py index d610cf4ee2..c173eb6faf 100644 --- a/djangoapps/courseware/capa/responsetypes.py +++ b/djangoapps/courseware/capa/responsetypes.py @@ -1,5 +1,6 @@ import json import math +import numbers import numpy import random import scipy @@ -158,9 +159,7 @@ class formularesponse(object): ''' d=dict([(k, numpy.complex(d[k])) for k in d if type(k)==str and \ k.isalnum() and \ - (type(d[k]) == float or \ - type(d[k]) == int or \ - type(d[k]) == complex) ]) + isinstance(d[k], numbers.Number)]) return d def get_answers(self):