From 0bb11335b2e8242592ef33804b8a0ffbb1a89e4e Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Tue, 1 Oct 2013 13:53:59 -0400 Subject: [PATCH] We aren't ready to use XBlock.load_class, there are duplicate entry point names, and simply choosing the first one leads to unpredictability. --- common/lib/xmodule/xmodule/modulestore/xml.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py index 74c375a545..da86279b68 100644 --- a/common/lib/xmodule/xmodule/modulestore/xml.py +++ b/common/lib/xmodule/xmodule/modulestore/xml.py @@ -17,7 +17,7 @@ from xmodule.error_module import ErrorDescriptor from xmodule.errortracker import make_error_tracker, exc_info_to_str from xmodule.course_module import CourseDescriptor from xmodule.mako_module import MakoDescriptorSystem -from xmodule.x_module import XMLParsingSystem +from xmodule.x_module import XMLParsingSystem, XModuleDescriptor from xmodule.html_module import HtmlDescriptor from xblock.core import XBlock @@ -238,7 +238,7 @@ def create_block_from_xml(xml_data, system, org=None, course=None, default_class """ node = etree.fromstring(xml_data) - raw_class = XBlock.load_class(node.tag, default_class) + raw_class = XModuleDescriptor.load_class(node.tag, default_class) xblock_class = system.mixologist.mix(raw_class) # leave next line commented out - useful for low-level debugging