From 816e94c7603c5e2c63dbbf90182e748d3f75c9ed Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 19 Apr 2016 16:12:13 +0200 Subject: [PATCH] Fix multiple exceptions Turns out that this syntax needs to be surrounded in brackets. Contributes to issue CURA-844. --- plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py | 2 +- plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py b/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py index 1a6f7b9da9..8799c32b46 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py @@ -15,7 +15,7 @@ import io #To write config files to strings as if they were files. def importVersion1(serialised): try: return MachineInstance(serialised) - except configparser.Error, SettingsError.InvalidFormatError, SettingsError.InvalidVersionError: + except (configparser.Error, SettingsError.InvalidFormatError, SettingsError.InvalidVersionError): return None ## A representation of a machine instance used as intermediary form for diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py index 52180b72e0..65fc243de6 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py @@ -14,7 +14,7 @@ import io #To write config files to strings as if they were files. def importVersion1(serialised): try: return Profile(serialised) - except configparser.Error, SettingsError.InvalidFormatError, SettingsError.InvalidVersionError: + except (configparser.Error, SettingsError.InvalidFormatError, SettingsError.InvalidVersionError): return None ## A representation of a profile used as intermediary form for conversion from