fix: typing broke some use cases

Signed-off-by: Paul Horton <paul.horton@owasp.org>
madpah · Jul 13, 2022 · c766507 · c766507
1 parent b0bafcf
commit c766507
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/vexy/parser/cyclonedx.py b/vexy/parser/cyclonedx.py
@@ -25,7 +25,7 @@
 import json
 import keyword
 from datetime import datetime
-from typing import Any, Dict, Set
+from typing import cast, Any, Dict, Set
 from xml.dom.minidom import Element, Text, parseString
 
 from cyclonedx.model.bom import Bom
@@ -117,10 +117,10 @@ def _component_from_json(json_data: Dict[str, Any]) -> Component:
 def _component_from_xml(xml_element: Element) -> Component:
     jd = {}
     for e in xml_element.childNodes:
-        if isinstance(e, Element) and isinstance(e, Text):
+        if isinstance(e, Element):
             if e.nodeName == 'purl':
-                jd.update({e.nodeName: PackageURL.from_string(purl=str(e.firstChild.data).strip())})
+                jd.update({e.nodeName: PackageURL.from_string(purl=str(cast(Text, e.firstChild).data).strip())})
             elif e.nodeName not in _XML_IGNORE_KEYS:
-                jd.update({e.nodeName: str(e.firstChild.data).strip()})
+                jd.update({e.nodeName: str(cast(Text, e.firstChild)..data).strip()})
 
     return Component(**jd)