Merge remote-tracking branch 'origin/master' into CURA-7492_Change_how_the_connection_status_is_determined

This commit is contained in:
Nino van Hooff 2020-06-15 14:19:35 +02:00
commit 6071161d88
6 changed files with 224 additions and 1 deletions

View file

@ -465,7 +465,7 @@ class XmlMaterialProfile(InstanceContainer):
return "materials"
@classmethod
def getVersionFromSerialized(cls, serialized: str) -> Optional[int]:
def getVersionFromSerialized(cls, serialized: str) -> int:
data = ET.fromstring(serialized)
version = XmlMaterialProfile.Version