Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #430 from MITx/feature/ichuang/fix-modulestore-etree-parser

Browse Source 
Fix bug preventing comments from being in course.xml
This commit is contained in:
Calen Pennington
2012-08-16 09:06:14 -07:00
parent 919b3e2137 7553dac2f3
commit 6bca6cdc28
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/lib/xmodule/xmodule/modulestore/xml.py
View File

@@ -6,6 +6,7 @@ import re
from fs.osfs import OSFS
from importlib import import_module
from lxml import etree
from lxml.html import HtmlComment
from path import path
from xmodule.errortracker import ErrorLog, make_error_tracker
from xmodule.x_module import XModuleDescriptor, XMLParsingSystem
@@ -16,9 +17,10 @@ from cStringIO import StringIO
from . import ModuleStoreBase, Location
from .exceptions import ItemNotFoundError
etree.set_default_parser(
etree.XMLParser(dtd_validation=False, load_dtd=False,
remove_comments=True, remove_blank_text=True))
edx_xml_parser = etree.XMLParser(dtd_validation=False, load_dtd=False,
remove_comments=True, remove_blank_text=True)
etree.set_default_parser(edx_xml_parser)
log = logging.getLogger('mitx.' + __name__)
@@ -211,7 +213,7 @@ class XMLModuleStore(ModuleStoreBase):
# been imported into the cms from xml
course_file = StringIO(clean_out_mako_templating(course_file.read()))
course_data = etree.parse(course_file).getroot()
course_data = etree.parse(course_file,parser=edx_xml_parser).getroot()
org = course_data.get('org')