Browse Source

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.
Ghostkeeper 6 years ago
parent
commit
b331736cb2
1 changed files with 4 additions and 4 deletions
  1. 4 4
      cura/Settings/CuraContainerStack.py

+ 4 - 4
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.
     #   \return The ID of the definition container to use when searching for instance containers.
     @classmethod
     @classmethod
-    def _findInstanceContainerDefinitionId(cls, machine_definition: DefinitionContainer) -> str:
+    def _findInstanceContainerDefinitionId(cls, machine_definition: DefinitionContainerInterface) -> str:
         quality_definition = machine_definition.getMetaDataEntry("quality_definition")
         quality_definition = machine_definition.getMetaDataEntry("quality_definition")
         if not quality_definition:
         if not quality_definition:
-            return machine_definition.id
+            return machine_definition.id #type: ignore
 
 
         definitions = ContainerRegistry.getInstance().findDefinitionContainers(id = quality_definition)
         definitions = ContainerRegistry.getInstance().findDefinitionContainers(id = quality_definition)
         if not definitions:
         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])
         return cls._findInstanceContainerDefinitionId(definitions[0])