GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 18:59:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling dictionaries without 'defaults' section

Browse Source 
According to the test, this should return an empty dict then.

Contributes to issue CURA-5929.
This commit is contained in:
Ghostkeeper 2018-11-12 13:33:44 +01:00
parent bbbb08c793
commit 0bf7bf4cbe
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/LegacyProfileReader/LegacyProfileReader.py
View File

@ -6,6 +6,7 @@ import io
import json # For reading the Dictionary of Doom. import json # For reading the Dictionary of Doom.
import math # For mathematical operations included in the Dictionary of Doom. import math # For mathematical operations included in the Dictionary of Doom.
import os.path # For concatenating the path to the plugin and the relative path to the Dictionary of Doom. import os.path # For concatenating the path to the plugin and the relative path to the Dictionary of Doom.
from typing import Dict
from UM.Application import Application # To get the machine manager to create the new profile in. from UM.Application import Application # To get the machine manager to create the new profile in.
from UM.Logger import Logger # Logging errors. from UM.Logger import Logger # Logging errors.
@ -33,8 +34,9 @@ class LegacyProfileReader(ProfileReader):
# \param json The JSON file to load the default setting values from. This # \param json The JSON file to load the default setting values from. This
# should not be a URL but a pre-loaded JSON handle. # should not be a URL but a pre-loaded JSON handle.
# \return A dictionary of the default values of the legacy Cura version. # \return A dictionary of the default values of the legacy Cura version.
def prepareDefaults(self, json): def prepareDefaults(self, json: Dict[str, Dict[str, str]]) -> Dict[str, str]:
defaults = {} defaults = {}
if "defaults" in json:
for key in json["defaults"]: # We have to copy over all defaults from the JSON handle to a normal dict. for key in json["defaults"]: # We have to copy over all defaults from the JSON handle to a normal dict.
defaults[key] = json["defaults"][key] defaults[key] = json["defaults"][key]
return defaults return defaults