lordwelch/comicapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'unicodeFix' into develop

Browse Source
This commit is contained in:
Timmy Welch 2022-03-20 10:43:02 -07:00
commit f0f30e8416
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
comicapi/comicinfoxml.py
View File

@ -51,12 +51,9 @@ class ComicInfoXml:
return self.convertXMLToMetadata(tree) return self.convertXMLToMetadata(tree)
def stringFromMetadata(self, metadata, xml=None): def stringFromMetadata(self, metadata, xml=None):
header = '<?xml version="1.0"?>\n'
tree = self.convertMetadataToXML(self, metadata, xml) tree = self.convertMetadataToXML(self, metadata, xml)
tree_str = ET.tostring(tree.getroot()).decode() tree_str = ET.tostring(tree.getroot(), encoding="utf-8", xml_declaration=True).decode()
return header + tree_str return tree_str
def indent(self, elem, level=0): def indent(self, elem, level=0):
# for making the XML output readable # for making the XML output readable
@ -90,7 +87,6 @@ class ComicInfoXml:
def assign(cix_entry, md_entry): def assign(cix_entry, md_entry):
if md_entry is not None: if md_entry is not None:
print(cix_entry, md_entry)
et_entry = root.find(cix_entry) et_entry = root.find(cix_entry)
if et_entry is not None: if et_entry is not None:
et_entry.text = "{0}".format(md_entry) et_entry.text = "{0}".format(md_entry)
@ -278,7 +274,7 @@ class ComicInfoXml:
tree = self.convertMetadataToXML(self, metadata, xml) tree = self.convertMetadataToXML(self, metadata, xml)
# ET.dump(tree) # ET.dump(tree)
tree.write(filename, encoding='utf-8') tree.write(filename, encoding="utf-8", xml_declaration=True)
def readFromExternalFile(self, filename): def readFromExternalFile(self, filename):