From 303508a95bd695755b634ca73b4c4a977110ac31 Mon Sep 17 00:00:00 2001 From: Julian Arni Date: Sun, 22 Sep 2013 21:39:14 -0400 Subject: [PATCH 1/2] Revert "Make default parser keep comments" This reverts commit 238899faacc9fae8a31099153b44713bdb6beabb. --- common/lib/xmodule/xmodule/modulestore/xml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py index 432abd7cb3..93ab0497f9 100644 --- a/common/lib/xmodule/xmodule/modulestore/xml.py +++ b/common/lib/xmodule/xmodule/modulestore/xml.py @@ -29,7 +29,7 @@ from .exceptions import ItemNotFoundError from .inheritance import compute_inherited_metadata edx_xml_parser = etree.XMLParser(dtd_validation=False, load_dtd=False, - remove_comments=False, remove_blank_text=True) + remove_comments=True, remove_blank_text=True) etree.set_default_parser(edx_xml_parser) From 920b76410c88713f227eec3e3b8f40383c575e96 Mon Sep 17 00:00:00 2001 From: Julian Arni Date: Sun, 22 Sep 2013 21:39:36 -0400 Subject: [PATCH 2/2] Revert "don't remove comments from xml module" This reverts commit 343456e31445d471492bbfe2d786375ef05352ce. --- common/lib/xmodule/xmodule/xml_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py index a9a7245e4a..5fa9ff3260 100644 --- a/common/lib/xmodule/xmodule/xml_module.py +++ b/common/lib/xmodule/xmodule/xml_module.py @@ -17,7 +17,7 @@ log = logging.getLogger(__name__) # assume all XML files are persisted as utf-8. edx_xml_parser = etree.XMLParser(dtd_validation=False, load_dtd=False, - remove_comments=False, remove_blank_text=True, + remove_comments=True, remove_blank_text=True, encoding='utf-8')