Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

add support for empty argument on pretty_xml

Browse Source
This commit is contained in:
Peter Bieringer
2025-12-10 17:52:54 +01:00
parent 97875b9514
commit bac608a37a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
radicale/xmlutils.py
View File

@@ -26,7 +26,7 @@ import copy
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from collections import OrderedDict from collections import OrderedDict
from http import client from http import client
from typing import Dict, Mapping, Optional from typing import Dict, Mapping, Optional, Union
from urllib.parse import quote from urllib.parse import quote
from radicale import item, pathutils from radicale import item, pathutils
@@ -56,7 +56,7 @@ for short, url in NAMESPACES.items():
ET.register_namespace("" if short == "D" else short, url) ET.register_namespace("" if short == "D" else short, url)
def pretty_xml(element: ET.Element) -> str: def pretty_xml(element: Union[ET.Element | None]) -> str:
"""Indent an ElementTree ``element`` and its children.""" """Indent an ElementTree ``element`` and its children."""
def pretty_xml_recursive(element: ET.Element, level: int) -> None: def pretty_xml_recursive(element: ET.Element, level: int) -> None:
indent = "\n" + level * " " indent = "\n" + level * " "
@@ -71,6 +71,9 @@ def pretty_xml(element: ET.Element) -> str:
sub_element.tail = indent sub_element.tail = indent
elif level > 0 and not (element.tail or "").strip(): elif level > 0 and not (element.tail or "").strip():
element.tail = indent element.tail = indent
if element is None:
return ""
element = copy.deepcopy(element) element = copy.deepcopy(element)
pretty_xml_recursive(element, 0) pretty_xml_recursive(element, 0)
return '<?xml version="1.0"?>\n%s' % ET.tostring(element, "unicode") return '<?xml version="1.0"?>\n%s' % ET.tostring(element, "unicode")