Merge pull request #19 from kobotoolbox/briefcase-push-fix

Restore support for XML strings in create_survey_element_from_xml
kobotoolbox · Jul 28, 2015 · 6dfff06 · 6dfff06
2 parents 6609028 + 2f09bba
commit 6dfff06
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pyxform/xform2json.py b/pyxform/xform2json.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 import os
+import io
 import re
 import json
 import copy
@@ -171,7 +172,10 @@ def ConvertXmlToDict(root, dictclass=XmlDictObject):
 
 
 def create_survey_element_from_xml(xml_file):
-    sb = XFormToDictBuilder(xml_file)
+    if isinstance(xml_file, basestring):
+        # xml_file may be a string of markup instead of a file-like object
+        xml_file = io.BytesIO(xml_file)
+    sb = XFormToDictBuilder(filelike_obj=xml_file)
     return sb.survey()