3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 14:37:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rename input vs. output parsers

Browse source 
Technically you could re-use the variable name but that is confusing.

Contributes to issue CURA-5929.
This commit is contained in:
Ghostkeeper 2018-11-12 11:16:33 +01:00
parent 9c555bf67f
commit 9d94b0d63e
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/LegacyProfileReader/LegacyProfileReader.py
View file

@ -82,9 +82,9 @@ class LegacyProfileReader(ProfileReader):
profile_id = container_registry.uniqueName("Imported Legacy Profile") profile_id = container_registry.uniqueName("Imported Legacy Profile")
profile = InstanceContainer(profile_id) # Create an empty profile. profile = InstanceContainer(profile_id) # Create an empty profile.
parser = configparser.ConfigParser(interpolation = None) input_parser = configparser.ConfigParser(interpolation = None)
try: try:
parser.read([file_name]) # Parse the INI file. input_parser.read([file_name]) # Parse the INI file.
except Exception as e: except Exception as e:
Logger.log("e", "Unable to open legacy profile %s: %s", file_name, str(e)) Logger.log("e", "Unable to open legacy profile %s: %s", file_name, str(e))
return None return None
@ -92,7 +92,7 @@ class LegacyProfileReader(ProfileReader):
# Legacy Cura saved the profile under the section "profile_N" where N is the ID of a machine, except when you export in which case it saves it in the section "profile". # Legacy Cura saved the profile under the section "profile_N" where N is the ID of a machine, except when you export in which case it saves it in the section "profile".
# Since importing multiple machine profiles is out of scope, just import the first section we find. # Since importing multiple machine profiles is out of scope, just import the first section we find.
section = "" section = ""
for found_section in parser.sections(): for found_section in input_parser.sections():
if found_section.startswith("profile"): if found_section.startswith("profile"):
section = found_section section = found_section
break break
@ -110,7 +110,7 @@ class LegacyProfileReader(ProfileReader):
return None return None
defaults = self.prepareDefaults(dict_of_doom) defaults = self.prepareDefaults(dict_of_doom)
legacy_settings = self.prepareLocals(parser, section, defaults) #Gets the settings from the legacy profile. legacy_settings = self.prepareLocals(input_parser, section, defaults) #Gets the settings from the legacy profile.
#Check the target version in the Dictionary of Doom with this application version. #Check the target version in the Dictionary of Doom with this application version.
if "target_version" not in dict_of_doom: if "target_version" not in dict_of_doom:
@ -152,15 +152,15 @@ class LegacyProfileReader(ProfileReader):
profile.setDirty(True) profile.setDirty(True)
#Serialise and deserialise in order to perform the version upgrade. #Serialise and deserialise in order to perform the version upgrade.
parser = configparser.ConfigParser(interpolation = None) output_parser = configparser.ConfigParser(interpolation = None)
data = profile.serialize() data = profile.serialize()
parser.read_string(data) output_parser.read_string(data)
parser["general"]["version"] = "1" output_parser["general"]["version"] = "1"
if parser.has_section("values"): if output_parser.has_section("values"):
parser["settings"] = parser["values"] output_parser["settings"] = output_parser["values"]
del parser["values"] del output_parser["values"]
stream = io.StringIO() stream = io.StringIO()
parser.write(stream) output_parser.write(stream)
data = stream.getvalue() data = stream.getvalue()
profile.deserialize(data) profile.deserialize(data)