Unstable state; need to merge from master

2012-05-31 13:44:45 -04:00
parent 9fdbdd3b73
commit 34dc32e5aa
11 changed files with 147 additions and 92 deletions
--- a/djangoapps/courseware/modules/capa_module.py
+++ b/djangoapps/courseware/modules/capa_module.py
@@ -31,6 +31,9 @@ class ComplexEncoder(json.JSONEncoder):
            return "{real:.7g}{imag:+.7g}*j".format(real = obj.real,imag = obj.imag)
        return json.JSONEncoder.default(self, obj)

+class ModuleDescriptor(XModuleDescriptor):
+    pass
+
 class Module(XModule):
    ''' Interface between capa_problem and x_module. Originally a hack
    meant to be refactored out, but it seems to be serving a useful