Small changes to make xml dump into as few files as possible

ce30a27f · Calen Pennington · 10b417c8 · ce30a27f · ce30a27f
Commit ce30a27f authored Dec 13, 2012 by Calen Pennington
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

common/lib/xmodule/xmodule/html_module.py
+6 -1

common/lib/xmodule/xmodule/xml_module.py
+1 -1

No files found.
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -149,10 +149,15 @@ class HtmlDescriptor(XmlDescriptor, EditingDescriptor):
        write just <html filename="" [meta-attrs="..."]> to filename.xml, and the html
        string to filename.html.
        '''
+        # If the file is a single html document, just use it directly
        try:
            return etree.fromstring(self.definition['data'])
        except etree.XMLSyntaxError:
-            pass
+            # Otherwise, try wrapping it in a single html tag, and returning that
+            try:
+                return etree.fromstring("<html>%s</html>" % self.definition['data'])
+            except etree.XMLSyntaxError:
+                pass

        # Not proper format.  Write html to file, return an empty tag
        pathname = name_to_pathname(self.url_name)

--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -326,7 +326,7 @@ class XmlDescriptor(XModuleDescriptor):
        NOTE: Do not override this without a good reason.  It is here
        specifically for customtag...
        """
-        return True
+        return False


    def export_to_xml(self, resource_fs):