Merge pull request #224 from MITx/fix_optioninput

minor patch to fix optioninput; merging this in now, to unblock berkeley's changes to MC; passes my tests.

common/lib/capa/capa/inputtypes.py

@@ -132,7 +132,8 @@ def optioninput(element, value, status, render_template, msg=''):
     oset = [x[1:-1] for x  in list(oset)]
 
     # osetdict = dict([('option_%s_%s' % (eid,x),oset[x]) for x in range(len(oset)) ])	# make dict with IDs
-    osetdict = dict([(oset[x],oset[x]) for x in range(len(oset)) ])	# make dict with key,value same
+    osetdict = [(oset[x],oset[x]) for x in range(len(oset)) ]	# make ordered list with (key,value) same
+    # TODO: allow ordering to be randomized
     
     context={'id':eid,
              'value':value,

lms/templates/optioninput.html → common/lib/capa/capa/templates/optioninput.html

@@ -2,7 +2,7 @@
   
    <select name="input_${id}" id="input_${id}" >
       <option value="option_${id}_dummy_default">  </option>
-      % for option_id, option_description in options.items():
+      % for option_id, option_description in options:
           <option value="${option_id}"
           % if (option_id==value):
         	selected="true"

common/lib/xmodule/xmodule/seq_module.py

@@ -81,7 +81,7 @@ class SequenceModule(XModule):
         # of script, even if it occurs mid-string. Do this after json.dumps()ing
         # so that we can be sure of the quotations being used
         import re
-        params = {'items': re.sub(r'</(script)', r'\u003c/\1', json.dumps(contents), flags=re.IGNORECASE),
+        params = {'items': re.sub(r'(?i)</(script)', r'\u003c/\1', json.dumps(contents)),	# ?i = re.IGNORECASE for py2.6 compatability
                   'element_id': self.location.html_id(),
                   'item_id': self.id,
                   'position': self.position,