echo change in 1a68a3047124 to remove outdated call to modules.get_module_class

--HG--
branch : pmitros-mod-template

courseware/capa/calc.py

 import copy
+import logging
 import math
 import operator
 
@@ -27,10 +28,15 @@ default_variables = {'j':numpy.complex(0,1),
                      }
 
 
+log = logging.getLogger("mitx.courseware.capa")
+
 def evaluator(variables, functions, string):
     ''' Evaluate an expression. Variables are passed as a dictionary
     from string to value. Unary functions are passed as a dictionary
     from string to function '''
+    log.debug(u"Evaluating: {0} with vars: {1}, funcs: {2}"
+              .format(string, variables, functions))
+
     all_variables = copy.copy(default_variables)
     all_variables.update(variables)
     all_functions = copy.copy(default_functions)

courseware/module_render.py

@@ -60,10 +60,10 @@ def modx_dispatch(request, module=None, dispatch=None, id=None):
 
     ajax_url = '/modx/'+module+'/'+id+'/'
 
-    id_tag=courseware.modules.get_module_class(module.id_attribute)
+    # id_tag=courseware.modules.get_module_class(module)
 
     # Grab the XML corresponding to the request from course.xml
-    xml = content_parser.module_xml(content_parser.course_file(request.user), module, id_tag, id)
+    xml = content_parser.module_xml(content_parser.course_file(request.user), module, 'id', id)
 
     # Create the module
     instance=courseware.modules.get_module_class(module)(xml,