Merge

courseware/capa_problem.py

@@ -13,7 +13,7 @@ def strip_dict(d):
                                            (type(d[k]) == float or type(d[k]) == int) ])
     return d
 
-class LoncapaProblem():
+class LoncapaProblem(object):
     def get_state(self):
         ''' Stored per-user session data neeeded to: 
             1) Recreate the problem

courseware/x_module.py

@@ -1,4 +1,4 @@
-class XModule:
+class XModule(object):
     ''' Implements a generic learning module. 
         Initialized on access with __init__, first time with state=None, and
         then with state