"canonicalize(...)" added

setup.py

@@ -148,7 +148,11 @@ setup(
     #
     # For an analysis of "install_requires" vs pip's requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=['peppercorn'],  # Optional
+    install_requires=[
+    'lxml',
+    'prettierfier',
+    'flask'
+    ],  # Optional
 
     # List additional groups of dependencies here (e.g. development
     # dependencies). Users will be able to install these using the "extras"

templates/xml/calibration_item.xml

@@ -24,7 +24,7 @@
       {%- for j in i['description'] %}
       <dcc:content lang="{{j.lang}}">
         {%- for k in j.content %}
-        {{utils.sanitize_ltx(k)|safe}}
+        {{k|safe}}
         {% endfor -%}
       </dcc:content>
       {% endfor -%}

templates/xml/used_methods.xml

@@ -14,7 +14,7 @@
       {%- for j in i['description'] %}
       <dcc:content lang="{{j.lang}}">
         {%- for k in j.content %}
-        {{utils.sanitize_ltx(k)|safe}}
+        {{k|safe}}
         {% endfor -%}
       </dcc:content>
       {% endfor -%}

trans.py

@@ -2,6 +2,7 @@ from flask import Flask, render_template
 
 import utils as utils
 import os
+from lxml import etree
 from prettierfier import prettify_xml
 
 config = utils.config
@@ -22,7 +23,7 @@ def cert_to_xml(cert_doc):
            
     xml = render_template(dcc_template, doc=cert_doc['DCC'], utils=utils)  
     try:
-        xml = prettify_xml(xml, indent=2, debug=False)
+        xml = etree.canonicalize(prettify_xml(xml, indent=2, debug=False))
     except Exception as error:
         xml = '<error>' + str(error) + '</error>\n'
     

utils.py

@@ -68,7 +68,7 @@ ltx2entity = {
   '>':'>'
 }
 
-def sanitize_ltx(x):
+def sanitize_ltx(x):# unnecessary, as done by canonicalize
     for key in ltx2entity:
         x = x.replace(key, ltx2entity[key])
     return x