IMPROVEMENT: more defusexml fixes

ArduPilot · Jun 17, 2024 · e446fc3 · e446fc3
1 parent cf230ee
commit e446fc3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/MethodicConfigurator/annotate_params.py b/MethodicConfigurator/annotate_params.py
@@ -31,11 +31,10 @@
 from sys import exit as sys_exit
 from typing import Any, Dict, List, Optional, Tuple
 
-from xml.etree import ElementTree as ET # no parsing, just data-structure manipulation
-
 import argparse
 import logging
 
+from xml.etree import ElementTree as ET # no parsing, just data-structure manipulation
 from defusedxml import ElementTree as DET # just parsing, no data-structure manipulation
 
 

diff --git a/unittests/annotate_params_test.py b/unittests/annotate_params_test.py
@@ -14,11 +14,13 @@
 from unittest.mock import patch, mock_open
 import os
 import unittest
-import xml.etree.ElementTree as ET
 import requests
 import mock
 
-from annotate_params import get_xml_data
+from xml.etree import ElementTree as ET  # no parsing, just data-structure manipulation
+from defusedxml import ElementTree as DET  # just parsing, no data-structure manipulation
+
+from MethodicConfigurator.annotate_params import get_xml_data
 from MethodicConfigurator.annotate_params import remove_prefix
 from MethodicConfigurator.annotate_params import split_into_lines
 from MethodicConfigurator.annotate_params import create_doc_dict
@@ -258,7 +260,7 @@ def test_create_doc_dict(self):
             </param>
         </root>
         '''
-        root = ET.fromstring(xml_data)
+        root = DET.fromstring(xml_data)
 
         # Expected output
         expected_output = {
@@ -491,7 +493,7 @@ def test_print_read_only_params(self, mock_info):
             </param>
         </root>
         '''
-        root = ET.fromstring(xml_data)
+        root = DET.fromstring(xml_data)
         doc_dict = create_doc_dict(root, "VehicleType")
 
         # Call the function with the mock XML data