Apply suggestions from code review

CURA-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>

cura/CuraApplication.py

@@ -484,7 +484,7 @@ class CuraApplication(QtApplication):
                 ("variant", InstanceContainer.Version * 1000000 + self.SettingVersion):                         (self.ResourceTypes.VariantInstanceContainer, "application/x-uranium-instancecontainer"),
                 ("setting_visibility", SettingVisibilityPresetsModel.Version * 1000000 + self.SettingVersion):  (self.ResourceTypes.SettingVisibilityPreset, "application/x-uranium-preferences"),
                 ("machine", 2):                                                                                 (Resources.DefinitionContainers, "application/x-uranium-definitioncontainer"),
-                ("abstract_machine", 2):                                                                        (Resources.DefinitionContainers, "application/x-uranium-definitioncontainer"),
+                ("abstract_machine", 1):                                                                        (Resources.DefinitionContainers, "application/x-uranium-definitioncontainer"),
                 ("extruder", 2):                                                                                    (Resources.DefinitionContainers, "application/x-uranium-definitioncontainer")
             }
         )

cura/Settings/AbstractMachine.py

@@ -24,11 +24,11 @@ class AbstractMachine(GlobalStack):
 
 
 ## private:
-abstract_machine_mime = MimeType(
+_abstract_machine_mime = MimeType(
     name = "application/x-cura-abstract-machine",
     comment = "Cura Abstract Machine",
     suffixes = ["global.cfg"]
 )
 
-MimeTypeDatabase.addMimeType(abstract_machine_mime)
-ContainerRegistry.addContainerTypeByName(AbstractMachine, "abstract_machine", abstract_machine_mime.name)
+MimeTypeDatabase.addMimeType(_abstract_machine_mime)
+ContainerRegistry.addContainerTypeByName(AbstractMachine, "abstract_machine", _abstract_machine_mime.name)

cura/Settings/CuraContainerRegistry.py

@@ -108,7 +108,7 @@ class CuraContainerRegistry(ContainerRegistry):
         :param container_type: :type{string} Type of the container (machine, quality, ...)
         :param container_name: :type{string} Name to check
         """
-        container_class = ContainerStack if container_type in "machine" else InstanceContainer
+        container_class = ContainerStack if "machine" in container_type else InstanceContainer
 
         return self.findContainersMetadata(container_type = container_class, id = container_name, type = container_type, ignore_case = True) or \
                 self.findContainersMetadata(container_type = container_class, name = container_name, type = container_type)

cura/Settings/CuraStackBuilder.py

@@ -290,7 +290,7 @@ class CuraStackBuilder:
             case []:
                 # It should not be possible for the definition to be missing since an abstract machine will only
                 # be created as a result of a machine with definition_id being created.
-                Logger.error("w", "Definition {definition} was not found!", definition=definition_id)
+                Logger.error(f"Definition {definition_id} was not found!")
                 return None
             case [machine_definition, *_definitions]:
                 machine_node = container_tree.machines[machine_definition.getId()]