Unstable commit; syncing computers

djangoapps/courseware/module_render.py

@@ -128,14 +128,14 @@ def get_module(user, request, xml_module, module_object_preload):
         smod.save()
         module_object_preload.append(smod)
 
-    return smod
+    return (instance, smod)
 
 def render_x_module(user, request, xml_module, module_object_preload):
     ''' Generic module for extensions. This renders to HTML. '''
-    if module==None :
+    if xml_module==None :
         return {"content":""}
 
-    smod = get_module(user, request, xml_module, module_object_preload)
+    (instance, smod) = get_module(user, request, xml_module, module_object_preload)
 
     # Grab content
     content = instance.get_html()

djangoapps/courseware/modules/capa_module.py

@@ -18,7 +18,7 @@ from lxml import etree
 ## TODO: Abstract out from Django
 from mitxmako.shortcuts import render_to_string
 
-from x_module import XModule
+from x_module import XModule, XModuleDescriptor
 from courseware.capa.capa_problem import LoncapaProblem, StudentInputError
 import courseware.content_parser as content_parser
 from multicourse import multicourse_settings

djangoapps/courseware/modules/html_module.py

@@ -2,7 +2,7 @@ import json
 
 from mitxmako.shortcuts import render_to_response, render_to_string
 
-from x_module import XModule
+from x_module import XModule, XModuleDescriptor
 from lxml import etree
 
 class ModuleDescriptor(XModuleDescriptor):

djangoapps/courseware/modules/schematic_module.py

@@ -4,7 +4,7 @@ import json
 from django.conf import settings
 from mitxmako.shortcuts import render_to_response, render_to_string
 
-from x_module import XModule
+from x_module import XModule, XModuleDescriptor
 
 class ModuleDescriptor(XModuleDescriptor):
     pass

djangoapps/courseware/modules/seq_module.py

@@ -4,7 +4,7 @@ from lxml import etree
 
 from mitxmako.shortcuts import render_to_string
 
-from x_module import XModule
+from x_module import XModule, XModuleDescriptor
 
 # HACK: This shouldn't be hard-coded to two types
 # OBSOLETE: This obsoletes 'type'
@@ -57,7 +57,7 @@ class Module(XModule):
         titles = ["\n".join([i.get("name").strip() for i in e.iter() if i.get("name") != None]) \
                        for e in self.xmltree]
 
-        self.contents = self.rendered_children(self)
+        self.contents = self.rendered_children()
 
         for contents, title in zip(self.contents, titles):
             contents['title'] = title

djangoapps/courseware/modules/template_module.py

@@ -3,7 +3,7 @@ import os
 
 from mitxmako.shortcuts import render_to_response, render_to_string
 
-from x_module import XModule
+from x_module import XModule, XModuleDescriptor
 from lxml import etree
 
 class ModuleDescriptor(XModuleDescriptor):

djangoapps/courseware/modules/vertical_module.py

@@ -2,7 +2,7 @@ import json
 
 from mitxmako.shortcuts import render_to_response, render_to_string
 
-from x_module import XModule
+from x_module import XModule, XModuleDescriptor
 from lxml import etree
 
 class ModuleDescriptor(XModuleDescriptor):

djangoapps/courseware/modules/video_module.py

@@ -5,7 +5,7 @@ from lxml import etree
 
 from mitxmako.shortcuts import render_to_response, render_to_string
 
-from x_module import XModule
+from x_module import XModule, XModuleDescriptor
 
 log = logging.getLogger("mitx.courseware.modules")
 

djangoapps/courseware/modules/x_module.py

@@ -1,3 +1,5 @@
+from lxml import etree
+
 import courseware.progress
 
 def dummy_track(event_type, event):
@@ -36,7 +38,7 @@ class XModule(object):
         Render all children. 
         This really ought to return a list of xmodules, instead of dictionaries
         '''
-        children = [render_function(e) for e in self.__xmltree]
+        children = [self.render_function(e) for e in self.__xmltree]
         return children            
 
     def __init__(self, system = None, xml = None, item_id = None,