From 2292f908c5d6038d562434471ad4ac814ccf4c47 Mon Sep 17 00:00:00 2001 From: tritao Date: Thu, 20 Mar 2025 11:24:30 +0000 Subject: [PATCH] Tools: Use ModuleName when determining which modules to compare against XML bindings. --- src/Tools/bindings/model/generateModel_Python.py | 1 + src/Tools/bindings/model/typedModel.py | 1 + src/Tools/bindings/templates/templateClassPyExport.py | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Tools/bindings/model/generateModel_Python.py b/src/Tools/bindings/model/generateModel_Python.py index 70776a3307..28d802db56 100644 --- a/src/Tools/bindings/model/generateModel_Python.py +++ b/src/Tools/bindings/model/generateModel_Python.py @@ -511,6 +511,7 @@ def _parse_class(class_node, source_code: str, path: str, imports_mapping: dict) py_export = PythonExport( Documentation=doc_obj, + ModuleName=module_name, Name=export_decorator_kwargs.get("Name", "") or native_python_class_name, PythonName=export_decorator_kwargs.get("PythonName", "") or None, Include=export_decorator_kwargs.get("Include", "") or include, diff --git a/src/Tools/bindings/model/typedModel.py b/src/Tools/bindings/model/typedModel.py index c6b1b1122c..594cf8d2dd 100644 --- a/src/Tools/bindings/model/typedModel.py +++ b/src/Tools/bindings/model/typedModel.py @@ -181,6 +181,7 @@ class PythonExport: NoArgs: bool = False # Attributes + ModuleName: str = "" Name: str = "" PythonName: Optional[str] = None Include: str = "" diff --git a/src/Tools/bindings/templates/templateClassPyExport.py b/src/Tools/bindings/templates/templateClassPyExport.py index 60bc850891..5f614966b0 100644 --- a/src/Tools/bindings/templates/templateClassPyExport.py +++ b/src/Tools/bindings/templates/templateClassPyExport.py @@ -37,7 +37,7 @@ def compareFiles(file1, file2): class TemplateClassPyExport(template.ModelTemplate): # TODO: This is temporary, once all XML files are migrated, this can be removed. def getPath(self, path): - if self.is_python and not self.export.Namespace in ["Base"]: + if self.is_python and not self.export.ModuleName in ["Base"]: root, ext = os.path.splitext(path) return f"{root}_{ext}" return path