From f7ca48987703007896b6170790d03438369451dd Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 28 Apr 2016 12:29:14 +0200 Subject: [PATCH] Rename exportTo -> export Because exportTo doesn't make sense if there is no parameter to which we're exporting. Contributes to issue CURA-844. --- .../VersionUpgrade/VersionUpgrade21to22/MachineInstance.py | 2 +- plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py | 2 +- .../VersionUpgrade21to22/VersionUpgrade21to22.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py b/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py index 06438d994d..bf01c877ff 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py @@ -57,7 +57,7 @@ class MachineInstance: # # \return A serialised form of this machine instance, serialised in # version 2 of the file format. - def exportTo(self): + def export(self): import VersionUpgrade21to22 # Import here to prevent circular dependencies. config = configparser.ConfigParser(interpolation = None) # Build a config file in the form of version 2. diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py index 22b68bdbbf..52518f3502 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py @@ -72,7 +72,7 @@ class Profile: # # \return A serialised form of this profile, serialised in version 2 of # the file format. - def exportTo(self): + def export(self): import VersionUpgrade21to22 # Import here to prevent circular dependencies. config = configparser.ConfigParser(interpolation = None) diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py b/plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py index 9312da690d..303a6c0634 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py @@ -19,7 +19,7 @@ class VersionUpgrade21to22(VersionUpgrade): machine_instance = MachineInstance.importFrom(serialised) if not machine_instance: #Invalid file format. return None - return machine_instance.exportTo() + return machine_instance.export() ## Converts profiles from format version 1 to version 2. # @@ -30,7 +30,7 @@ class VersionUpgrade21to22(VersionUpgrade): profile = Profile.importFrom(serialised) if not profile: # Invalid file format. return None - return profile.exportTo() + return profile.export() ## Translates settings for the change from Cura 2.1 to 2.2. #