Merge pull request #355 from MITx/arjun/choicegroup_text

Removing the <text> wrapper around choice text for radiogroup and checkboxgroup

common/lib/capa/capa/inputtypes.py

@@ -204,7 +204,7 @@ def extract_choices(element):
             raise Exception("[courseware.capa.inputtypes.extract_choices] \
                              Expected a <choice> tag; got %s instead"
                              % choice.tag)
-        choice_text = ''.join([etree.tostring(x) for x in choice])
+        choice_text = ''.join([x.text for x in choice])
 
         choices.append((choice.get("name"), choice_text))