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

Merge branch 'removeIndent' into develop

Browse Source
This commit is contained in:
Timmy Welch 2022-04-30 00:01:53 -07:00
commit 1a93b28c9d
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
comicapi/comet.py
View File

@ -121,7 +121,7 @@ class CoMet:
if credit["role"].lower() in set(self.editor_synonyms): if credit["role"].lower() in set(self.editor_synonyms):
ET.SubElement(root, "editor").text = str(credit["person"]) ET.SubElement(root, "editor").text = str(credit["person"])
utils.indent(root) ET.indent(root)
# wrap it in an ElementTree instance, and save as XML # wrap it in an ElementTree instance, and save as XML
tree = ET.ElementTree(root) tree = ET.ElementTree(root)

2
comicapi/comicinfoxml.py
View File

@ -177,7 +177,7 @@ class ComicInfoXml:
page_node = ET.SubElement(pages_node, "Page") page_node = ET.SubElement(pages_node, "Page")
page_node.attrib = dict(sorted(page_dict.items())) page_node.attrib = dict(sorted(page_dict.items()))
utils.indent(root) ET.indent(root)
# wrap it in an ElementTree instance, and save as XML # wrap it in an ElementTree instance, and save as XML
tree = ET.ElementTree(root) tree = ET.ElementTree(root)

17
comicapi/utils.py
View File

@ -33,23 +33,6 @@ class UtilsVars:
already_fixed_encoding = False already_fixed_encoding = False
def indent(elem, level=0):
# for making the XML output readable
i = "\n" + level * " "
if len(elem):
if not elem.text or not elem.text.strip():
elem.text = i + " "
if not elem.tail or not elem.tail.strip():
elem.tail = i
for ele in elem:
indent(ele, level + 1)
if not elem.tail or not elem.tail.strip():
elem.tail = i
else:
if level and (not elem.tail or not elem.tail.strip()):
elem.tail = i
def get_actual_preferred_encoding(): def get_actual_preferred_encoding():
preferred_encoding = locale.getpreferredencoding() preferred_encoding = locale.getpreferredencoding()
if platform.system() == "Darwin": if platform.system() == "Darwin":