From b331736cb2188d4102ae11c6a5057b9f7fa51cd0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 13 Jun 2018 17:22:17 +0200 Subject: [PATCH] Let _findInstanceContainerDefinitionId work with DefinitionContainerInterface But where it needs the .id field it needs to ignore this type because this works with getattr weirdness. Contributes to issue CURA-5330. --- cura/Settings/CuraContainerStack.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index ba97f232a3..0cee696a8d 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -303,15 +303,15 @@ class CuraContainerStack(ContainerStack): # # \return The ID of the definition container to use when searching for instance containers. @classmethod - def _findInstanceContainerDefinitionId(cls, machine_definition: DefinitionContainer) -> str: + def _findInstanceContainerDefinitionId(cls, machine_definition: DefinitionContainerInterface) -> str: quality_definition = machine_definition.getMetaDataEntry("quality_definition") if not quality_definition: - return machine_definition.id + return machine_definition.id #type: ignore definitions = ContainerRegistry.getInstance().findDefinitionContainers(id = quality_definition) if not definitions: - Logger.log("w", "Unable to find parent definition {parent} for machine {machine}", parent = quality_definition, machine = machine_definition.id) - return machine_definition.id + Logger.log("w", "Unable to find parent definition {parent} for machine {machine}", parent = quality_definition, machine = machine_definition.id) #type: ignore + return machine_definition.id #type: ignore return cls._findInstanceContainerDefinitionId(definitions[0])