Skip to content

E
edx-platform
Commit 33f13846 by Calen Pennington
Options

Merge branch 'release'

parents ed1a0738 b9f8869c
Showing with 2 additions and 2 deletions
common/lib/xmodule/xmodule/x_module.py
...@@ -576,10 +576,10 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock): ...@@ -576,10 +576,10 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
org and course are optional strings that will be used in the generated org and course are optional strings that will be used in the generated
module's url identifiers module's url identifiers
""" """
class_ = XModuleDescriptor.load_class( class_ = system.mixologist.mix(XModuleDescriptor.load_class(
etree.fromstring(xml_data).tag, etree.fromstring(xml_data).tag,
default_class default_class
) ))
# leave next line, commented out - useful for low-level debugging # leave next line, commented out - useful for low-level debugging
# log.debug('[XModuleDescriptor.load_from_xml] tag=%s, class_=%s' % ( # log.debug('[XModuleDescriptor.load_from_xml] tag=%s, class_=%s' % (
# etree.fromstring(xml_data).tag,class_)) # etree.fromstring(xml_data).tag,class_))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment