From d0f96b6511815eb20a2609f6d9cb5be485de2fb8 Mon Sep 17 00:00:00 2001
From: Timmy Welch <timmy@narnian.us>
Date: Sat, 19 Mar 2022 18:17:38 -0700
Subject: [PATCH] Ensure XML is UTF-8 encoded

---
 comicapi/comicinfoxml.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/comicapi/comicinfoxml.py b/comicapi/comicinfoxml.py
index d6a307b..1d80c78 100644
--- a/comicapi/comicinfoxml.py
+++ b/comicapi/comicinfoxml.py
@@ -51,12 +51,9 @@ class ComicInfoXml:
         return self.convertXMLToMetadata(tree)
 
     def stringFromMetadata(self, metadata, xml=None):
-
-        header = '<?xml version="1.0"?>\n'
-
         tree = self.convertMetadataToXML(self, metadata, xml)
-        tree_str = ET.tostring(tree.getroot()).decode()
-        return header + tree_str
+        tree_str = ET.tostring(tree.getroot(), encoding="utf-8", xml_declaration=True).decode()
+        return tree_str
 
     def indent(self, elem, level=0):
         # for making the XML output readable
@@ -278,7 +275,7 @@ class ComicInfoXml:
 
         tree = self.convertMetadataToXML(self, metadata, xml)
         # ET.dump(tree)
-        tree.write(filename, encoding='utf-8')
+        tree.write(filename, encoding="utf-8", xml_declaration=True)
 
     def readFromExternalFile(self, filename):