Commit 14431624 by Calen Pennington

Remove old parts of xmodules used in sketch

parent 0a4dcf1e
......@@ -3,8 +3,6 @@ import logging
from lxml import etree
from .mako_module import MakoModuleDescriptor
from .xml_module import XmlDescriptor
from .xmodule import XModule
from .progress import Progress
from .exceptions import NotFoundError
......@@ -110,30 +108,3 @@ class SequenceModule(XModule):
new_class = c
return new_class
class SequenceDescriptor(MakoModuleDescriptor, XmlDescriptor):
mako_template = 'widgets/sequence-edit.html'
module_class = SequenceModule
stores_state = True # For remembering where in the sequence the student is
template_dir_name = 'sequence'
@classmethod
def definition_from_xml(cls, xml_object, system):
children = []
for child in xml_object:
try:
children.append(system.process_xml(etree.tostring(child)).location.url())
except:
log.exception("Unable to load child when parsing Sequence. Continuing...")
continue
return {'children': children}
def definition_to_xml(self, resource_fs):
xml_object = etree.Element('sequential')
for child in self.get_children():
xml_object.append(
etree.fromstring(child.export_to_xml(resource_fs)))
return xml_object
......@@ -8,11 +8,11 @@ class Usage(namedtuple('Usage', 'id source settings children')):
@classmethod
def create_usage(cls, source):
xmodule = xmodule.get_module(source)
#module = xmodule.get_module(source)
return Usage(
uuid(),
xmodule.id,
xmodule.course_settings,
"UUID",
"Foo",
{},
[],
)
......@@ -31,6 +31,9 @@ def load_usage(usage_tree):
settings: default settings values set by the source xmodule
children: child usages
"""
if usage_tree is None:
return None
usage_tree['children'] = [load_usage(child) for child in usage_tree['children']]
return Usage(**usage_tree)
......@@ -44,5 +47,5 @@ class StructureModule(XModule):
@property
def usage_tree(self):
if self._usage_tree is None:
self._usage_tree = load_usage(self.content['usage_tree'])
self._usage_tree = load_usage(self.content.get('usage_tree', None))
return self._usage_tree
from .xmodule import XModule, register_view
from .seq_module import SequenceDescriptor
from .progress import Progress
from .module_resources import render_template
......@@ -31,7 +30,3 @@ class VerticalModule(XModule):
if c in child_classes:
new_class = c
return new_class
class VerticalDescriptor(SequenceDescriptor):
module_class = VerticalModule
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