fix: move namespace cleanup to source

The namespace cleanup was being ignored for MDQ
per-entity publication - it did nothing when
invoked on element other than the root element.

It would also be resource intensive to clean up
when publishing each individual element.

Clean up instead at the source - and there,
the guard condition is no longer required
(the working document is always XML)

Co-authored-by: Johan Wassberg <jocar@sunet.se>

Author: vladimir-mencl-eresearch

src/pyff/builtins.py

@@ -552,13 +552,6 @@ def _nop(x):
     out = output_file
     data = req.t
 
-    # clean unused namespaces - the working document isn't always XML (eg discojson* produce JSON)
-    if isinstance(data, (etree._Element, etree._ElementTree)):
-        # Keep xs: and xsi:, as these are crucial - and xs: is used only
-        # in attribute values, so may appear as unused.
-        keep_ns_prefixes = ['xs', 'xsi']
-        etree.cleanup_namespaces(data, keep_ns_prefixes=keep_ns_prefixes)
-
     if not req.args.get('raw'):
         data = dumptree(req.t, pretty_print=req.args.get('pretty_print'))
 

src/pyff/samlmd.py

@@ -488,6 +488,12 @@ def entitiesdescriptor(
             ent_insert = deepcopy(ent_insert)
         t.append(ent_insert)
 
+    # clean unused namespaces
+    # Keep xs: and xsi:, as these are crucial - and xs: is used only
+    # in attribute values, so may appear as unused.
+    keep_ns_prefixes = ['xs', 'xsi']
+    etree.cleanup_namespaces(t, keep_ns_prefixes=keep_ns_prefixes)
+
     if config.devel_write_xml_to_file:
         import os