refactor(dicttoxml): improve typing and xml type detection; simplify get_unique_id API

- Accept optional ids list to avoid collisions deterministically in tests
- Replace legacy type name checks with direct 'str'/'int'
- Update tests to use monkeypatch for duplicate id simulation

Author: vinitkumar

json2xml/dicttoxml.py

@@ -31,17 +31,19 @@ def make_id(element: str, start: int = 100000, end: int = 999999) -> str:
     return f"{element}_{safe_random.randint(start, end)}"
 
 
-def get_unique_id(element: str) -> str:
+def get_unique_id(element: str, ids: list[str] | None = None) -> str:
     """
     Generate a unique ID for a given element.
 
     Args:
         element (str): The element to generate an ID for.
+        ids (list[str] | None, optional): A list of existing IDs to avoid duplicates. Defaults to None.
 
     Returns:
         str: The unique ID.
     """
-    ids: list[str] = []  # initialize list of unique ids
+    if ids is None:
+        ids = []
     this_id = make_id(element)
     dup = True
     while dup:
@@ -78,9 +80,9 @@ def get_xml_type(val: ELEMENT) -> str:
         str: The XML type.
     """
     if val is not None:
-        if type(val).__name__ in ("str", "unicode"):
+        if type(val).__name__ == "str":
             return "str"
-        if type(val).__name__ in ("int", "long"):
+        if type(val).__name__ == "int":
             return "int"
         if type(val).__name__ == "float":
             return "float"

tests/test_dict2xml.py

@@ -1,6 +1,7 @@
 import datetime
 import numbers
 from typing import TYPE_CHECKING, Any
+from unittest.mock import Mock
 
 import pytest
 
@@ -774,50 +775,16 @@ def test_dicttoxml_with_cdata(self) -> None:
         result = dicttoxml.dicttoxml(data, cdata=True, attr_type=False, root=False)
         assert b"<key><![CDATA[value]]></key>" == result
 
-    def test_get_unique_id_with_duplicates(self) -> None:
+    def test_get_unique_id_with_duplicates(self, monkeypatch: "MonkeyPatch") -> None:
         """Test get_unique_id when duplicates are generated."""
-        # We need to modify the original get_unique_id to simulate a pre-existing ID list
-        import json2xml.dicttoxml as module
+        ids = ["existing_id"]
+        make_id_mock = Mock(side_effect=["existing_id", "new_id"])
+        monkeypatch.setattr(dicttoxml, "make_id", make_id_mock)
 
-        # Save original function
-        original_get_unique_id = module.get_unique_id
-
-        # Track make_id calls
-        call_count = 0
-        original_make_id = module.make_id
-
-        def mock_make_id(element: str, start: int = 100000, end: int = 999999) -> str:
-            nonlocal call_count
-            call_count += 1
-            if call_count == 1:
-                return "test_123456"  # First call - will collide
-            else:
-                return "test_789012"  # Second call - unique
-
-        # Patch get_unique_id to use a pre-populated ids list
-        def patched_get_unique_id(element: str) -> str:
-            # Start with a pre-existing ID to force collision
-            ids = ["test_123456"]
-            this_id = module.make_id(element)
-            dup = True
-            while dup:
-                if this_id not in ids:
-                    dup = False
-                    ids.append(this_id)
-                else:
-                    this_id = module.make_id(element)  # This exercises line 52
-            return ids[-1]
-
-        module.make_id = mock_make_id
-        module.get_unique_id = patched_get_unique_id
+        unique_id = dicttoxml.get_unique_id("some_element", ids=ids)
 
-        try:
-            result = dicttoxml.get_unique_id("test")
-            assert result == "test_789012"
-            assert call_count == 2
-        finally:
-            module.make_id = original_make_id
-            module.get_unique_id = original_get_unique_id
+        assert unique_id == "new_id"
+        assert make_id_mock.call_count == 2
 
     def test_convert_with_bool_direct(self) -> None:
         """Test convert function with boolean input directly."""