From f73154a2c5722dedfd433086f2eba32e7b7614d4 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Mon, 12 Jun 2023 14:35:11 +0200 Subject: [PATCH] Use camelCase for python function definition CURA-10599 Co-authored-by: Jaime van Kessel --- cura/Machines/MachineNode.py | 2 +- cura/Machines/VariantNode.py | 2 +- tests/Machines/TestVariantNode.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py index 578629b6a2..aa4db8bb8f 100644 --- a/cura/Machines/MachineNode.py +++ b/cura/Machines/MachineNode.py @@ -168,7 +168,7 @@ class MachineNode(ContainerNode): return self.global_qualities.get(self.preferred_quality_type, next(iter(self.global_qualities.values()))) - def is_excluded_material(self, material: MaterialNode) -> bool: + def isExcludedMaterial(self, material: MaterialNode) -> bool: """Returns whether the material should be excluded from the list of materials.""" for exclude_material in self.exclude_materials: if exclude_material in material["id"]: diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index e57c45e9dd..6c3e9359d0 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -60,7 +60,7 @@ class VariantNode(ContainerNode): materials = list(materials_per_base_file.values()) # Filter materials based on the exclude_materials property. - filtered_materials = [material for material in materials if not self.machine.is_excluded_material(material)] + filtered_materials = [material for material in materials if not self.machine.isExcludedMaterial(material)] for material in filtered_materials: base_file = material["base_file"] diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py index 3975eef3d1..e15d64a444 100644 --- a/tests/Machines/TestVariantNode.py +++ b/tests/Machines/TestVariantNode.py @@ -46,7 +46,7 @@ def getInstanceContainerSideEffect(*args, **kwargs): def machine_node(): mocked_machine_node = MagicMock() mocked_machine_node.container_id = "machine_1" - mocked_machine_node.is_excluded_material = MagicMock(return_value=False) + mocked_machine_node.isExcludedMaterial = MagicMock(return_value=False) mocked_machine_node.preferred_material = "preferred_material" return mocked_machine_node @@ -96,7 +96,7 @@ def test_variantNodeInit(container_registry, machine_node): def test_variantNodeInit_excludedMaterial(container_registry, machine_node): machine_node.exclude_materials = ["material_1"] - machine_node.is_excluded_material = MagicMock(side_effect=lambda material: material["id"] == "material_1") + machine_node.isExcludedMaterial = MagicMock(side_effect=lambda material: material["id"] == "material_1") node = createVariantNode("variant_1", machine_node, container_registry) assert "material_1" not in node.materials