fix conditional module

common/lib/capa/capa/chem/tests.py

@@ -277,7 +277,6 @@ class Test_Render_Equations(unittest.TestCase):
 
     def test_render9(self):
         s = "5[Ni(NH3)4]^2+ + 5/2SO4^2-"
-        #import ipdb; ipdb.set_trace()
         out = render_to_html(s)
         correct = u'<span class="math">5[Ni(NH<sub>3</sub>)<sub>4</sub>]<sup>2+</sup>+<sup>5</sup>&frasl;<sub>2</sub>SO<sub>4</sub><sup>2-</sup></span>'
         log(out + ' ------- ' + correct, 'html')
@@ -311,7 +310,7 @@ class Test_Render_Equations(unittest.TestCase):
         log(out + ' ------- ' + correct, 'html')
         self.assertEqual(out, correct)
 
-        
+
     def test_render_eq3(self):
         s = "H^+ + OH^- <= H2O"   # unsupported arrow
         out = render_to_html(s)

common/lib/xmodule/xmodule/conditional_module.py

@@ -59,7 +59,7 @@ class ConditionalModule(XModule):
             % xml_attr)
 
     def is_condition_satisfied(self):
-        self.required_modules = [self.system.get_module(descriptor) for
+        self.required_modules = [self.system.get_module(descriptor.location) for
             descriptor in self.descriptor.get_required_module_descriptors()]
         xml_value, attr_name = self._get_condition()