From 97c068475500e2cc5121833b6f2f362f9e1bed4d Mon Sep 17 00:00:00 2001 From: Jeremy Bowman Date: Mon, 19 Aug 2019 14:26:08 -0400 Subject: [PATCH] Cleaner fix for byte conversion in from_xml --- common/lib/xmodule/xmodule/course_module.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py index e6cd403148..57ba4e10ad 100644 --- a/common/lib/xmodule/xmodule/course_module.py +++ b/common/lib/xmodule/xmodule/course_module.py @@ -1153,7 +1153,9 @@ class CourseDescriptor(CourseFields, SequenceDescriptor, LicenseMixin): # bleh, have to parse the XML here to just pull out the url_name attribute # I don't think it's stored anywhere in the instance. - course_file = BytesIO(six.binary_type(xml_data)) + if isinstance(xml_data, six.text_type): + xml_data = xml_data.encode('ascii', 'ignore') + course_file = BytesIO(xml_data) xml_obj = etree.parse(course_file, parser=edx_xml_parser).getroot() policy_dir = None