diff --git a/plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py b/plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py index 994493a4e6..770aace3fe 100644 --- a/plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py +++ b/plugins/FirmwareUpdateChecker/FirmwareUpdateChecker.py @@ -1,6 +1,6 @@ -# Copyright (c) 2015 Ultimaker B.V. +# Copyright (c) 2017 Ultimaker B.V. # Cura is released under the terms of the AGPLv3 or higher. -from UM.Application import Application + from UM.Extension import Extension from UM.Preferences import Preferences from UM.Logger import Logger @@ -33,9 +33,9 @@ class FirmwareUpdateChecker(Extension): ContainerRegistry.getInstance().containerAdded.connect(self._onContainerAdded) def _onContainerAdded(self, container): - # Only take care when a new GlobaStack was added - if (isinstance(container, GlobalStack)): - Logger.log("i", "You have a '%s' in printer list. Let's check the firmware!" % container.getId()) + # Only take care when a new GlobalStack was added + if isinstance(container, GlobalStack): + Logger.log("i", "You have a '%s' in printer list. Let's check the firmware!", container.getId()) self.checkFirmwareVersion(container, True) ## Connect with software.ultimaker.com, load latest.version and check version info. @@ -46,4 +46,4 @@ class FirmwareUpdateChecker(Extension): # This is used when checking for a new firmware version at startup. def checkFirmwareVersion(self, container = None, silent = False): job = FirmwareUpdateCheckerJob(container = container, silent = silent, url = self.url) - job.start() \ No newline at end of file + job.start() diff --git a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py index 9e0db57ed7..b95a2b1097 100644 --- a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py +++ b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015 Ultimaker B.V. +# Copyright (c) 2017 Ultimaker B.V. # Cura is released under the terms of the AGPLv3 or higher. from UM.Preferences import Preferences @@ -49,12 +49,12 @@ class FirmwareUpdateCheckerJob(Job): # If it is not None, then we compare between the checked_version and the current_version # Now we just do that if the active printer is Ultimaker 3 or Ultimaker 3 Extended or any # other Ultimaker 3 that will come in the future - if (machine_name[0:11] == "Ultimaker 3"): + if machine_name[0:11] == "Ultimaker 3": # Nothing to parse, just get the string # TODO: In the future may be done by parsing a JSON file with diferent version for each printer model current_version = reader(current_version_file).readline().rstrip() - Logger.log("i", "Reading firmware version of %s: %s" % (machine_name, current_version)) + Logger.log("i", "Reading firmware version of %s: %s", machine_name, current_version) # If it is the first time the version is checked, the checked_version is None checked_version = Preferences.getInstance().getValue("info/latest_checked_firmware") @@ -80,7 +80,7 @@ class FirmwareUpdateCheckerJob(Job): Preferences.getInstance().setValue("info/latest_checked_firmware", current_version) except Exception as e: - Logger.log("w", "Failed to check for new version: %s" % e) + Logger.log("w", "Failed to check for new version: %s", e) if not self.silent: Message(i18n_catalog.i18nc("@info", "Could not access update information.")).show() - return \ No newline at end of file + return diff --git a/plugins/FirmwareUpdateChecker/__init__.py b/plugins/FirmwareUpdateChecker/__init__.py index 5da6130772..b7343dc565 100644 --- a/plugins/FirmwareUpdateChecker/__init__.py +++ b/plugins/FirmwareUpdateChecker/__init__.py @@ -1,14 +1,16 @@ -# Copyright (c) 2015 Ultimaker B.V. +# Copyright (c) 2017 Ultimaker B.V. # Cura is released under the terms of the AGPLv3 or higher. from UM.i18n import i18nCatalog + from . import FirmwareUpdateChecker i18n_catalog = i18nCatalog("cura") + def getMetaData(): - return { - } + return {} + def register(app): - return { "extension": FirmwareUpdateChecker.FirmwareUpdateChecker()} + return {"extension": FirmwareUpdateChecker.FirmwareUpdateChecker()}