From e36ef583b7778d158c3dea97c328ff13ec12cc38 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 4 Apr 2018 11:55:46 +0200 Subject: [PATCH] Minor changes and cleanup --- cura/CuraApplication.py | 9 +++++++-- cura/Settings/CuraContainerRegistry.py | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 56d9dfcc87..6fbf7b79be 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -534,7 +534,9 @@ class CuraApplication(QtApplication): self._plugins_loaded = True @classmethod - def addCommandLineOptions(self, parser, parsed_command_line = {}): + def addCommandLineOptions(cls, parser, parsed_command_line = None): + if parsed_command_line is None: + parsed_command_line = {} super().addCommandLineOptions(parser, parsed_command_line = parsed_command_line) parser.add_argument("file", nargs="*", help="Files to load after starting the application.") parser.add_argument("--single-instance", action="store_true", default=False) @@ -591,7 +593,10 @@ class CuraApplication(QtApplication): # This should be called directly before creating an instance of CuraApplication. # \returns \type{bool} True if the whole Cura app should continue running. @classmethod - def preStartUp(cls, parser = None, parsed_command_line = {}): + def preStartUp(cls, parser = None, parsed_command_line = None): + if parsed_command_line is None: + parsed_command_line = {} + # Peek the arguments and look for the 'single-instance' flag. if not parser: parser = argparse.ArgumentParser(prog = "cura", add_help = False) # pylint: disable=bad-whitespace diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index dbbbdc0718..751ca40c58 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -2,7 +2,6 @@ # Cura is released under the terms of the LGPLv3 or higher. import os -import os.path import re import configparser