o Merging XSD files into one.

1 files changed, 9 insertions, 14 deletions

diff --git a/src/ee/xml/bom_file_utils.py b/src/ee/xml/bom_file_utils.py
index 063a7bd..59a9b0e 100644
--- a/src/ee/xml/bom_file_utils.py
+++ b/src/ee/xml/bom_file_utils.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-from ee.xml import bomFile, indexFile
+from ee.xml import types
 
 __all__ = [
     "facts",
@@ -11,16 +11,11 @@ __all__ = [
 
 
 def find_root_tag(root):
-    tag = next((tag for tag, klass in bomFile.GDSClassesMapping.items() if klass == type(root)), None)
+    return next((tag for tag, klass in types.GDSClassesMapping.items() if klass == type(root)), None)
 
-    if tag is not None:
-        return tag
 
-    return next((tag for tag, klass in indexFile.GDSClassesMapping.items() if klass == type(root)))
-
-
-def part_numbers(part: bomFile.Part) -> List[bomFile.PartNumber]:
-    pns = part.part_numbersProp  # type: bomFile.PartNumberList
+def part_numbers(part: types.Part) -> List[types.PartNumber]:
+    pns = part.part_numbersProp  # type: types.PartNumberList
 
     if pns is None:
         return []
@@ -28,20 +23,20 @@ def part_numbers(part: bomFile.Part) -> List[bomFile.PartNumber]:
     return pns.part_numberProp
 
 
-def find_pn(part: bomFile.Part) -> Optional[str]:
+def find_pn(part: types.Part) -> Optional[str]:
     for pn in part_numbers(part):
         if pn.distributor is None:
             return pn.value
 
 
-def find_dpn(part: bomFile.Part, distributor: str) -> Optional[str]:
+def find_dpn(part: types.Part, distributor: str) -> Optional[str]:
     for pn in part_numbers(part):
         if pn.distributor == distributor:
             return pn.value
 
 
-def facts(part: bomFile.Part, create=False) -> Optional[bomFile.FactList]:
-    fs: bomFile.FactList = part.factsProp
+def facts(part: types.Part, create=False) -> Optional[types.FactList]:
+    fs: types.FactList = part.factsProp
 
     if fs is not None:
         return fs
@@ -49,6 +44,6 @@ def facts(part: bomFile.Part, create=False) -> Optional[bomFile.FactList]:
     if not create:
         return
 
-    fs = bomFile.FactList()
+    fs = types.FactList()
     part.factsProp = fs
     return fs