Merge pull request #2113 from edx/fix/cdodge/few-xml-serialize-fixes

randomize_module.py was missing 'import lxml' to support definition_to_x...

Merge pull request #2113 from edx/fix/cdodge/few-xml-serialize-fixes
randomize_module.py was missing 'import lxml' to support definition_to_x...
27c6816b · chrisndodge · ebc991cc · b6090952 · 27c6816b · 27c6816b
Commit 27c6816b authored 11 years ago by chrisndodge
--- a/common/lib/xmodule/xmodule/randomize_module.py
+++ b/common/lib/xmodule/xmodule/randomize_module.py
@@ -4,6 +4,8 @@ import random
 from xmodule.x_module import XModule
 from xmodule.seq_module import SequenceDescriptor

+from lxml import etree
+
 from xblock.core import Scope, Integer

 log = logging.getLogger('mitx.' + __name__)

--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -136,6 +136,7 @@ class XmlDescriptor(XModuleDescriptor):
        'hide_progress_tab': bool_map,
        'allow_anonymous': bool_map,
        'allow_anonymous_to_peers': bool_map,
+        'show_timezone': bool_map,
    }



--- a/common/test/data/full/course.xml
+++ b/common/test/data/full/course.xml
-<course filename="6.002_Spring_2012" slug="6.002_Spring_2012" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" name="6.002 Spring 2012" start="2015-07-17T12:00" course="full" org="edX" />
+<course filename="6.002_Spring_2012" slug="6.002_Spring_2012" graceperiod="1 day 12 hours 59 minutes 59 seconds" showanswer="attempted" rerandomize="never" name="6.002 Spring 2012" start="2015-07-17T12:00" course="full" org="edX" show_timezone="true"/>
--- a/common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml
+++ b/common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml
@@ -12,4 +12,13 @@
    <html slug="html_95">Minor correction: Six elements (five resistors)…</html>
    <customtag tag="S1" slug="discuss_96" impl="discuss"/>
  </vertical>
+
+  <randomize url_name="PS1_Q4" display_name="Problem 4: Read a Molecule">
+    <vertical>
+  <html slug="html_900">
+    <!-- UTF-8 characters are acceptable… HTML entities are not -->
+    <h1>Inline content…</h1>
+  </html>
+</vertical>
+   </randomize>
 </sequential>