diff --git a/src/octoprint/__init__.py b/src/octoprint/__init__.py index 337a4378..658e8e03 100644 --- a/src/octoprint/__init__.py +++ b/src/octoprint/__init__.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2 # coding=utf-8 -from __future__ import absolute_import, print_function +from __future__ import absolute_import, division, print_function import sys import logging diff --git a/src/octoprint/_version.py b/src/octoprint/_version.py index f40ef1bc..ee940658 100644 --- a/src/octoprint/_version.py +++ b/src/octoprint/_version.py @@ -9,6 +9,7 @@ # versioneer-0.15+dev (https://github.com/warner/python-versioneer) """Git implementation of _version.py.""" +from __future__ import absolute_import, division, print_function import errno import os diff --git a/src/octoprint/cli/__init__.py b/src/octoprint/cli/__init__.py index 113f737b..43923eff 100644 --- a/src/octoprint/cli/__init__.py +++ b/src/octoprint/cli/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms of the AGPLv3 License" diff --git a/src/octoprint/cli/client.py b/src/octoprint/cli/client.py index 9615ddee..4d8a5eaa 100644 --- a/src/octoprint/cli/client.py +++ b/src/octoprint/cli/client.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms of the AGPLv3 License" diff --git a/src/octoprint/cli/dev.py b/src/octoprint/cli/dev.py index 7c5b126b..baf678bc 100644 --- a/src/octoprint/cli/dev.py +++ b/src/octoprint/cli/dev.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/cli/plugins.py b/src/octoprint/cli/plugins.py index 47bf887a..0988d2bd 100644 --- a/src/octoprint/cli/plugins.py +++ b/src/octoprint/cli/plugins.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms of the AGPLv3 License" diff --git a/src/octoprint/cli/server.py b/src/octoprint/cli/server.py index c2f3b605..47450387 100644 --- a/src/octoprint/cli/server.py +++ b/src/octoprint/cli/server.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms of the AGPLv3 License" diff --git a/src/octoprint/daemon.py b/src/octoprint/daemon.py index 90e4735a..6f41520c 100644 --- a/src/octoprint/daemon.py +++ b/src/octoprint/daemon.py @@ -5,8 +5,8 @@ Generic linux daemon base class Originally from http://www.jejik.com/articles/2007/02/a_simple_unix_linux_daemon_in_python/#c35 """ -from __future__ import (print_function, absolute_import) -import sys, os, time, signal +from __future__ import absolute_import, division, print_function +import sys, os, time, signal, io class Daemon: """ diff --git a/src/octoprint/events.py b/src/octoprint/events.py index ea5e8a4b..bcad583e 100644 --- a/src/octoprint/events.py +++ b/src/octoprint/events.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import (print_function, absolute_import) +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge , Lars Norpchen" __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/filemanager/__init__.py b/src/octoprint/filemanager/__init__.py index 94175345..817c8c9b 100644 --- a/src/octoprint/filemanager/__init__.py +++ b/src/octoprint/filemanager/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/filemanager/analysis.py b/src/octoprint/filemanager/analysis.py index 8fed445a..dcc52795 100644 --- a/src/octoprint/filemanager/analysis.py +++ b/src/octoprint/filemanager/analysis.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/filemanager/destinations.py b/src/octoprint/filemanager/destinations.py index c84ea9b9..11a97188 100644 --- a/src/octoprint/filemanager/destinations.py +++ b/src/octoprint/filemanager/destinations.py @@ -1,4 +1,5 @@ # coding=utf-8 +from __future__ import absolute_import, division, print_function __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' class FileDestinations(object): diff --git a/src/octoprint/filemanager/storage.py b/src/octoprint/filemanager/storage.py index bf0af565..26da98b7 100644 --- a/src/octoprint/filemanager/storage.py +++ b/src/octoprint/filemanager/storage.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/filemanager/util.py b/src/octoprint/filemanager/util.py index f3fe20fb..d8bd9561 100644 --- a/src/octoprint/filemanager/util.py +++ b/src/octoprint/filemanager/util.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugin/__init__.py b/src/octoprint/plugin/__init__.py index fa6810e2..a8736c4c 100644 --- a/src/octoprint/plugin/__init__.py +++ b/src/octoprint/plugin/__init__.py @@ -13,7 +13,7 @@ registered plugin types. :members: """ -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugin/core.py b/src/octoprint/plugin/core.py index 52528f1d..1195087d 100644 --- a/src/octoprint/plugin/core.py +++ b/src/octoprint/plugin/core.py @@ -20,7 +20,7 @@ way and could be extracted into a separate Python module in the future. """ -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugin/types.py b/src/octoprint/plugin/types.py index b75b3e1b..93040b44 100644 --- a/src/octoprint/plugin/types.py +++ b/src/octoprint/plugin/types.py @@ -14,7 +14,7 @@ Please note that the plugin implementation types are documented in the section """ -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/announcements/__init__.py b/src/octoprint/plugins/announcements/__init__.py index ce8101dc..0eb7f3ae 100644 --- a/src/octoprint/plugins/announcements/__init__.py +++ b/src/octoprint/plugins/announcements/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/corewizard/__init__.py b/src/octoprint/plugins/corewizard/__init__.py index 2e4db13b..25fab8e3 100644 --- a/src/octoprint/plugins/corewizard/__init__.py +++ b/src/octoprint/plugins/corewizard/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/cura/__init__.py b/src/octoprint/plugins/cura/__init__.py index ef2358a6..9b7045f3 100644 --- a/src/octoprint/plugins/cura/__init__.py +++ b/src/octoprint/plugins/cura/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agpl.html" diff --git a/src/octoprint/plugins/cura/profile.py b/src/octoprint/plugins/cura/profile.py index 3f6d3c24..07fe9802 100644 --- a/src/octoprint/plugins/cura/profile.py +++ b/src/octoprint/plugins/cura/profile.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/discovery/__init__.py b/src/octoprint/plugins/discovery/__init__.py index 4732ce19..2861c251 100644 --- a/src/octoprint/plugins/discovery/__init__.py +++ b/src/octoprint/plugins/discovery/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py index c623d466..c7c523f3 100644 --- a/src/octoprint/plugins/pluginmanager/__init__.py +++ b/src/octoprint/plugins/pluginmanager/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 1f294917..b2a06dac 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/cli.py b/src/octoprint/plugins/softwareupdate/cli.py index e1e45569..23ad08c7 100644 --- a/src/octoprint/plugins/softwareupdate/cli.py +++ b/src/octoprint/plugins/softwareupdate/cli.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms of the AGPLv3 License" diff --git a/src/octoprint/plugins/softwareupdate/exceptions.py b/src/octoprint/plugins/softwareupdate/exceptions.py index e4b6ecdf..452eabea 100644 --- a/src/octoprint/plugins/softwareupdate/exceptions.py +++ b/src/octoprint/plugins/softwareupdate/exceptions.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/scripts/update-octoprint.py b/src/octoprint/plugins/softwareupdate/scripts/update-octoprint.py index 1ed5b0c7..2d4b8ac6 100644 --- a/src/octoprint/plugins/softwareupdate/scripts/update-octoprint.py +++ b/src/octoprint/plugins/softwareupdate/scripts/update-octoprint.py @@ -1,5 +1,5 @@ #!/bin/env python2 -from __future__ import absolute_import, print_function +from __future__ import absolute_import, division, print_function __author__ = "Gina Haeussge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/updaters/__init__.py b/src/octoprint/plugins/softwareupdate/updaters/__init__.py index 206cccd1..4d218909 100644 --- a/src/octoprint/plugins/softwareupdate/updaters/__init__.py +++ b/src/octoprint/plugins/softwareupdate/updaters/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/updaters/pip.py b/src/octoprint/plugins/softwareupdate/updaters/pip.py index 10ebb3cc..a60ff211 100644 --- a/src/octoprint/plugins/softwareupdate/updaters/pip.py +++ b/src/octoprint/plugins/softwareupdate/updaters/pip.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/updaters/python_updater.py b/src/octoprint/plugins/softwareupdate/updaters/python_updater.py index c865baeb..f4df545b 100644 --- a/src/octoprint/plugins/softwareupdate/updaters/python_updater.py +++ b/src/octoprint/plugins/softwareupdate/updaters/python_updater.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/updaters/update_script.py b/src/octoprint/plugins/softwareupdate/updaters/update_script.py index 99aa70ae..62a210af 100644 --- a/src/octoprint/plugins/softwareupdate/updaters/update_script.py +++ b/src/octoprint/plugins/softwareupdate/updaters/update_script.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/util.py b/src/octoprint/plugins/softwareupdate/util.py index fa3fe5ac..27335182 100644 --- a/src/octoprint/plugins/softwareupdate/util.py +++ b/src/octoprint/plugins/softwareupdate/util.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/version_checks/__init__.py b/src/octoprint/plugins/softwareupdate/version_checks/__init__.py index 34c99fa5..2597bd1f 100644 --- a/src/octoprint/plugins/softwareupdate/version_checks/__init__.py +++ b/src/octoprint/plugins/softwareupdate/version_checks/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/version_checks/commandline.py b/src/octoprint/plugins/softwareupdate/version_checks/commandline.py index 2cefc1c3..f31a8ad9 100644 --- a/src/octoprint/plugins/softwareupdate/version_checks/commandline.py +++ b/src/octoprint/plugins/softwareupdate/version_checks/commandline.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/version_checks/git_commit.py b/src/octoprint/plugins/softwareupdate/version_checks/git_commit.py index b3646d10..05e88ac5 100644 --- a/src/octoprint/plugins/softwareupdate/version_checks/git_commit.py +++ b/src/octoprint/plugins/softwareupdate/version_checks/git_commit.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/version_checks/github_commit.py b/src/octoprint/plugins/softwareupdate/version_checks/github_commit.py index 34ca5999..70e14732 100644 --- a/src/octoprint/plugins/softwareupdate/version_checks/github_commit.py +++ b/src/octoprint/plugins/softwareupdate/version_checks/github_commit.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/version_checks/github_release.py b/src/octoprint/plugins/softwareupdate/version_checks/github_release.py index 6960d2e6..644cefa1 100644 --- a/src/octoprint/plugins/softwareupdate/version_checks/github_release.py +++ b/src/octoprint/plugins/softwareupdate/version_checks/github_release.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/softwareupdate/version_checks/python_checker.py b/src/octoprint/plugins/softwareupdate/version_checks/python_checker.py index 3ca017ab..a41ddaf4 100644 --- a/src/octoprint/plugins/softwareupdate/version_checks/python_checker.py +++ b/src/octoprint/plugins/softwareupdate/version_checks/python_checker.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/virtual_printer/__init__.py b/src/octoprint/plugins/virtual_printer/__init__.py index e915aa00..e22e3ce8 100644 --- a/src/octoprint/plugins/virtual_printer/__init__.py +++ b/src/octoprint/plugins/virtual_printer/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/plugins/virtual_printer/virtual.py b/src/octoprint/plugins/virtual_printer/virtual.py index 556bd5ba..3e14b6f1 100644 --- a/src/octoprint/plugins/virtual_printer/virtual.py +++ b/src/octoprint/plugins/virtual_printer/virtual.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/printer/__init__.py b/src/octoprint/printer/__init__.py index a8621d8e..70466ad0 100644 --- a/src/octoprint/printer/__init__.py +++ b/src/octoprint/printer/__init__.py @@ -15,7 +15,7 @@ abstracted version of the actual printer communication. :members: """ -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/printer/estimation.py b/src/octoprint/printer/estimation.py index 30e733fc..f51663bd 100644 --- a/src/octoprint/printer/estimation.py +++ b/src/octoprint/printer/estimation.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/printer/profile.py b/src/octoprint/printer/profile.py index 6102f523..1c92626f 100644 --- a/src/octoprint/printer/profile.py +++ b/src/octoprint/printer/profile.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/printer/standard.py b/src/octoprint/printer/standard.py index b9fa8dda..224e2b09 100644 --- a/src/octoprint/printer/standard.py +++ b/src/octoprint/printer/standard.py @@ -3,7 +3,7 @@ This module holds the standard implementation of the :class:`PrinterInterface` and it helpers. """ -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py index a653f409..c73ae755 100644 --- a/src/octoprint/server/__init__.py +++ b/src/octoprint/server/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/api/__init__.py b/src/octoprint/server/api/__init__.py index 55be59c4..c0cee7c8 100644 --- a/src/octoprint/server/api/__init__.py +++ b/src/octoprint/server/api/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/api/connection.py b/src/octoprint/server/api/connection.py index d7c75b9f..a78b4c0c 100644 --- a/src/octoprint/server/api/connection.py +++ b/src/octoprint/server/api/connection.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/api/files.py b/src/octoprint/server/api/files.py index 06cfe363..79230685 100644 --- a/src/octoprint/server/api/files.py +++ b/src/octoprint/server/api/files.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/api/job.py b/src/octoprint/server/api/job.py index d4862c4b..8f9d1a71 100644 --- a/src/octoprint/server/api/job.py +++ b/src/octoprint/server/api/job.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/api/languages.py b/src/octoprint/server/api/languages.py index 1d9c7e9c..9b06284a 100644 --- a/src/octoprint/server/api/languages.py +++ b/src/octoprint/server/api/languages.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/api/log.py b/src/octoprint/server/api/log.py index ba298b33..7f668c77 100644 --- a/src/octoprint/server/api/log.py +++ b/src/octoprint/server/api/log.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Marc Hannappel Salandora" __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/api/printer.py b/src/octoprint/server/api/printer.py index 50e74fcc..7688821a 100644 --- a/src/octoprint/server/api/printer.py +++ b/src/octoprint/server/api/printer.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/api/printer_profiles.py b/src/octoprint/server/api/printer_profiles.py index 21866199..bce3b145 100644 --- a/src/octoprint/server/api/printer_profiles.py +++ b/src/octoprint/server/api/printer_profiles.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py index ba08fc24..99a9bdf5 100644 --- a/src/octoprint/server/api/settings.py +++ b/src/octoprint/server/api/settings.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/api/slicing.py b/src/octoprint/server/api/slicing.py index a51e88b9..0d6d6611 100644 --- a/src/octoprint/server/api/slicing.py +++ b/src/octoprint/server/api/slicing.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/api/system.py b/src/octoprint/server/api/system.py index 76bc95a8..094c1c96 100644 --- a/src/octoprint/server/api/system.py +++ b/src/octoprint/server/api/system.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms of the AGPLv3 License" diff --git a/src/octoprint/server/api/timelapse.py b/src/octoprint/server/api/timelapse.py index c9e89c55..eaf00639 100644 --- a/src/octoprint/server/api/timelapse.py +++ b/src/octoprint/server/api/timelapse.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/api/users.py b/src/octoprint/server/api/users.py index c423bcf8..e2f1fe05 100644 --- a/src/octoprint/server/api/users.py +++ b/src/octoprint/server/api/users.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/apps/__init__.py b/src/octoprint/server/apps/__init__.py index b133f7da..f5e9e328 100644 --- a/src/octoprint/server/apps/__init__.py +++ b/src/octoprint/server/apps/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/util/__init__.py b/src/octoprint/server/util/__init__.py index 0b7c8393..c6416d81 100644 --- a/src/octoprint/server/util/__init__.py +++ b/src/octoprint/server/util/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py index 40087c3a..493934ef 100644 --- a/src/octoprint/server/util/flask.py +++ b/src/octoprint/server/util/flask.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function from flask import make_response __author__ = "Gina Häußge " diff --git a/src/octoprint/server/util/sockjs.py b/src/octoprint/server/util/sockjs.py index dcd7de7c..93188df5 100644 --- a/src/octoprint/server/util/sockjs.py +++ b/src/octoprint/server/util/sockjs.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/util/tornado.py b/src/octoprint/server/util/tornado.py index 3ef205dd..8fc53a7f 100644 --- a/src/octoprint/server/util/tornado.py +++ b/src/octoprint/server/util/tornado.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/util/watchdog.py b/src/octoprint/server/util/watchdog.py index 79a1cef5..f84672c3 100644 --- a/src/octoprint/server/util/watchdog.py +++ b/src/octoprint/server/util/watchdog.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/server/views.py b/src/octoprint/server/views.py index 4d121784..f49dff61 100644 --- a/src/octoprint/server/views.py +++ b/src/octoprint/server/views.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py index fed93526..eee35489 100644 --- a/src/octoprint/settings.py +++ b/src/octoprint/settings.py @@ -17,7 +17,7 @@ of various types and the configuration file itself. :undoc-members: """ -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/slicing/__init__.py b/src/octoprint/slicing/__init__.py index 46eb026e..22682e1b 100644 --- a/src/octoprint/slicing/__init__.py +++ b/src/octoprint/slicing/__init__.py @@ -12,7 +12,7 @@ In this module the slicing support of OctoPrint is encapsulated. :members: """ -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/slicing/exceptions.py b/src/octoprint/slicing/exceptions.py index 7f4b1b6a..c1c87a06 100644 --- a/src/octoprint/slicing/exceptions.py +++ b/src/octoprint/slicing/exceptions.py @@ -26,7 +26,7 @@ Slicing related exceptions. """ -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/timelapse.py b/src/octoprint/timelapse.py index bbf28005..06b19663 100644 --- a/src/octoprint/timelapse.py +++ b/src/octoprint/timelapse.py @@ -1,5 +1,5 @@ # coding=utf-8 - +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/users.py b/src/octoprint/users.py index 065aaff2..ee2d52cf 100644 --- a/src/octoprint/users.py +++ b/src/octoprint/users.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/util/__init__.py b/src/octoprint/util/__init__.py index 391cddb5..317e05c2 100644 --- a/src/octoprint/util/__init__.py +++ b/src/octoprint/util/__init__.py @@ -3,6 +3,7 @@ This module bundles commonly used utility methods or helper classes that are used in multiple places withing OctoPrint's source code. """ +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/util/avr_isp/chipDB.py b/src/octoprint/util/avr_isp/chipDB.py index be381c2a..6782ce14 100644 --- a/src/octoprint/util/avr_isp/chipDB.py +++ b/src/octoprint/util/avr_isp/chipDB.py @@ -1,4 +1,4 @@ - +from __future__ import absolute_import, division, print_function avrChipDB = { 'ATMega1280': { 'signature': [0x1E, 0x97, 0x03], diff --git a/src/octoprint/util/avr_isp/intelHex.py b/src/octoprint/util/avr_isp/intelHex.py index a7150dc7..5b73e617 100644 --- a/src/octoprint/util/avr_isp/intelHex.py +++ b/src/octoprint/util/avr_isp/intelHex.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import, division, print_function import io def readHex(filename): diff --git a/src/octoprint/util/avr_isp/ispBase.py b/src/octoprint/util/avr_isp/ispBase.py index 6c353721..7ed9a806 100644 --- a/src/octoprint/util/avr_isp/ispBase.py +++ b/src/octoprint/util/avr_isp/ispBase.py @@ -1,8 +1,9 @@ +from __future__ import absolute_import, division, print_function import os, struct, sys, time from serial import Serial -import chipDB +from . import chipDB class IspBase(): def programChip(self, flashData): diff --git a/src/octoprint/util/avr_isp/stk500v2.py b/src/octoprint/util/avr_isp/stk500v2.py index 99d8e2ea..a3fb6af0 100644 --- a/src/octoprint/util/avr_isp/stk500v2.py +++ b/src/octoprint/util/avr_isp/stk500v2.py @@ -1,9 +1,10 @@ +from __future__ import absolute_import, division, print_function import os, struct, sys, time from serial import Serial from serial import SerialException -import ispBase, intelHex +from . import ispBase, intelHex class Stk500v2(ispBase.IspBase): def __init__(self): diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index 5f2f2d35..145d9013 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge based on work by David Braam" __license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agpl.html" __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" diff --git a/src/octoprint/util/commandline.py b/src/octoprint/util/commandline.py index fe96d7a2..41e6abf7 100644 --- a/src/octoprint/util/commandline.py +++ b/src/octoprint/util/commandline.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/util/dev.py b/src/octoprint/util/dev.py index 952a96d7..eab8e475 100644 --- a/src/octoprint/util/dev.py +++ b/src/octoprint/util/dev.py @@ -2,7 +2,7 @@ """ This module provides a bunch of utility methods and helpers FOR DEVELOPMENT ONLY. """ - +from __future__ import absolute_import, division, print_function __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' import contextlib diff --git a/src/octoprint/util/gcodeInterpreter.py b/src/octoprint/util/gcodeInterpreter.py index 08d0f5cc..531a1c7b 100644 --- a/src/octoprint/util/gcodeInterpreter.py +++ b/src/octoprint/util/gcodeInterpreter.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge based on work by David Braam" __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' __copyright__ = "Copyright (C) 2013 David Braam, Gina Häußge - Released under terms of the AGPLv3 License" diff --git a/src/octoprint/util/jinja.py b/src/octoprint/util/jinja.py index 34954b88..287b165f 100644 --- a/src/octoprint/util/jinja.py +++ b/src/octoprint/util/jinja.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms of the AGPLv3 License" diff --git a/src/octoprint/util/paths.py b/src/octoprint/util/paths.py index 89a45ba3..8efb127f 100644 --- a/src/octoprint/util/paths.py +++ b/src/octoprint/util/paths.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/util/pip.py b/src/octoprint/util/pip.py index 6270c3ce..437427be 100644 --- a/src/octoprint/util/pip.py +++ b/src/octoprint/util/pip.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/src/octoprint/util/piptestballoon/setup.py b/src/octoprint/util/piptestballoon/setup.py index e00ea9a4..13dfc2ff 100644 --- a/src/octoprint/util/piptestballoon/setup.py +++ b/src/octoprint/util/piptestballoon/setup.py @@ -1,4 +1,4 @@ -from __future__ import print_function +from __future__ import absolute_import, division, print_function import os import sys diff --git a/src/octoprint_client/__init__.py b/src/octoprint_client/__init__.py index 77cbfc1e..b62a144c 100644 --- a/src/octoprint_client/__init__.py +++ b/src/octoprint_client/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms of the AGPLv3 License" diff --git a/src/octoprint_setuptools/__init__.py b/src/octoprint_setuptools/__init__.py index 1f160c72..8b0cbe37 100644 --- a/src/octoprint_setuptools/__init__.py +++ b/src/octoprint_setuptools/__init__.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import, print_function +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/tests/filemanager/test_filemanager.py b/tests/filemanager/test_filemanager.py index 75833d86..4ed51dd4 100644 --- a/tests/filemanager/test_filemanager.py +++ b/tests/filemanager/test_filemanager.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/tests/filemanager/test_localstorage.py b/tests/filemanager/test_localstorage.py index 55f7f154..b72fd095 100644 --- a/tests/filemanager/test_localstorage.py +++ b/tests/filemanager/test_localstorage.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/tests/plugin/test_settings.py b/tests/plugin/test_settings.py index 43bde77d..50c56858 100644 --- a/tests/plugin/test_settings.py +++ b/tests/plugin/test_settings.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/tests/printer/test_estimation.py b/tests/printer/test_estimation.py index 2944427f..dc73a79a 100644 --- a/tests/printer/test_estimation.py +++ b/tests/printer/test_estimation.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function from octoprint.printer.estimation import TimeEstimationHelper __author__ = "Gina Häußge " diff --git a/tests/slicing/test_slicingmanager.py b/tests/slicing/test_slicingmanager.py index e0d3ea9f..06639537 100644 --- a/tests/slicing/test_slicingmanager.py +++ b/tests/slicing/test_slicingmanager.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/tests/test_daemon.py b/tests/test_daemon.py index 8f90bcf9..965f0616 100644 --- a/tests/test_daemon.py +++ b/tests/test_daemon.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import (print_function, absolute_import) +from __future__ import absolute_import, division, print_function import unittest import mock diff --git a/tests/users/__init__.py b/tests/users/__init__.py index f9f102db..3e0a1622 100644 --- a/tests/users/__init__.py +++ b/tests/users/__init__.py @@ -2,7 +2,7 @@ """ Unit tests for octoprint.users """ -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/tests/util/test_comm_helpers.py b/tests/util/test_comm_helpers.py index e7b906f1..067eaf30 100644 --- a/tests/util/test_comm_helpers.py +++ b/tests/util/test_comm_helpers.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/tests/util/test_counted_event.py b/tests/util/test_counted_event.py index ec3a92b4..4928f801 100644 --- a/tests/util/test_counted_event.py +++ b/tests/util/test_counted_event.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/tests/util/test_file_helpers.py b/tests/util/test_file_helpers.py index 6cf33dbb..fa6f11bd 100644 --- a/tests/util/test_file_helpers.py +++ b/tests/util/test_file_helpers.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms of the AGPLv3 License" diff --git a/tests/util/test_repeated_timer.py b/tests/util/test_repeated_timer.py index 6eed773b..aa8c2c50 100644 --- a/tests/util/test_repeated_timer.py +++ b/tests/util/test_repeated_timer.py @@ -1,5 +1,5 @@ # coding=utf-8 -from __future__ import absolute_import +from __future__ import absolute_import, division, print_function __author__ = "Gina Häußge " __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html'