diff --git a/cgcs-patch/cgcs-patch/cgcs_make_patch/make_patch_functions.py b/cgcs-patch/cgcs-patch/cgcs_make_patch/make_patch_functions.py index 155b9c01..3b083da1 100644 --- a/cgcs-patch/cgcs-patch/cgcs_make_patch/make_patch_functions.py +++ b/cgcs-patch/cgcs-patch/cgcs_make_patch/make_patch_functions.py @@ -141,7 +141,7 @@ def handle_exception(exc_type, exc_value, exc_traceback): def write_xml_file(top, fname): # Generate the file, in a readable format if possible outfile = open(fname, 'w') - rough_xml = ElementTree.tostring(top, 'utf-8') + rough_xml = ElementTree.tostring(top) if platform.python_version() == "2.7.2": # The 2.7.2 toprettyxml() function unnecessarily indents # childless tags, adding whitespace. In the case of the @@ -1134,7 +1134,7 @@ class PatchRecipeData(object): def write_xml_file(self, top, fname): # Generate the file, in a readable format if possible outfile = open(fname, 'w') - rough_xml = ElementTree.tostring(top, 'utf-8') + rough_xml = ElementTree.tostring(top) if platform.python_version() == "2.7.2": # The 2.7.2 toprettyxml() function unnecessarily indents # childless tags, adding whitespace. In the case of the diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py b/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py index add102e8..d14eb13d 100644 --- a/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py +++ b/cgcs-patch/cgcs-patch/cgcs_patch/patch_functions.py @@ -500,7 +500,7 @@ class PatchData(object): # write the modified file outfile = open(new_filename, 'w') - rough_xml = ElementTree.tostring(root, 'utf-8') + rough_xml = ElementTree.tostring(root) if platform.python_version() == "2.7.2": # The 2.7.2 toprettyxml() function unnecessarily indents # childless tags, adding whitespace. In the case of the diff --git a/sw-patch/cgcs-patch/cgcs_patch/patch_functions.py b/sw-patch/cgcs-patch/cgcs_patch/patch_functions.py index 59094640..7a21f83a 100644 --- a/sw-patch/cgcs-patch/cgcs_patch/patch_functions.py +++ b/sw-patch/cgcs-patch/cgcs_patch/patch_functions.py @@ -278,7 +278,7 @@ class PatchData(object): # write the modified file outfile = open(new_filename, 'w') - rough_xml = ElementTree.tostring(root, 'utf-8') + rough_xml = ElementTree.tostring(root) if platform.python_version() == "2.7.2": # The 2.7.2 toprettyxml() function unnecessarily indents # childless tags, adding whitespace. In the case of the