From 821156c9d601e4efcedf87381f8bae59be1c6ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 17 May 2017 19:01:42 +0200 Subject: [PATCH] Py3: basestring => past.builtins.basestring --- src/octoprint/cli/dev.py | 2 ++ src/octoprint/filemanager/__init__.py | 2 ++ src/octoprint/filemanager/storage.py | 2 ++ src/octoprint/plugin/types.py | 1 + src/octoprint/plugins/cura/profile.py | 2 ++ src/octoprint/printer/standard.py | 2 ++ src/octoprint/server/__init__.py | 2 ++ src/octoprint/server/api/printer_profiles.py | 3 ++- src/octoprint/server/util/flask.py | 2 ++ src/octoprint/server/views.py | 2 ++ src/octoprint/settings.py | 1 + src/octoprint/util/__init__.py | 3 +++ src/octoprint/util/comm.py | 3 +++ 13 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/octoprint/cli/dev.py b/src/octoprint/cli/dev.py index 7273b8ba..0d8dd57a 100644 --- a/src/octoprint/cli/dev.py +++ b/src/octoprint/cli/dev.py @@ -8,6 +8,8 @@ __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms import click +from past.builtins import basestring + class OctoPrintDevelCommands(click.MultiCommand): """ Custom `click.MultiCommand `_ diff --git a/src/octoprint/filemanager/__init__.py b/src/octoprint/filemanager/__init__.py index 35c9075e..de78ecad 100644 --- a/src/octoprint/filemanager/__init__.py +++ b/src/octoprint/filemanager/__init__.py @@ -20,6 +20,8 @@ from .util import AbstractFileWrapper, StreamWrapper, DiskFileWrapper from collections import namedtuple +from past.builtins import basestring + ContentTypeMapping = namedtuple("ContentTypeMapping", "extensions, content_type") ContentTypeDetector = namedtuple("ContentTypeDetector", "extensions, detector") diff --git a/src/octoprint/filemanager/storage.py b/src/octoprint/filemanager/storage.py index c69b3e14..0f49ec88 100644 --- a/src/octoprint/filemanager/storage.py +++ b/src/octoprint/filemanager/storage.py @@ -20,6 +20,8 @@ from octoprint.util import atomic_write from contextlib import contextmanager from copy import deepcopy +from past.builtins import basestring + import octoprint.filemanager from octoprint.util import is_hidden_path diff --git a/src/octoprint/plugin/types.py b/src/octoprint/plugin/types.py index ae54df94..ea428ea4 100644 --- a/src/octoprint/plugin/types.py +++ b/src/octoprint/plugin/types.py @@ -23,6 +23,7 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms from .core import (Plugin, RestartNeedingPlugin, SortablePlugin) +from past.builtins import basestring class OctoPrintPlugin(Plugin): """ diff --git a/src/octoprint/plugins/cura/profile.py b/src/octoprint/plugins/cura/profile.py index 2f8792d0..c8dd1377 100644 --- a/src/octoprint/plugins/cura/profile.py +++ b/src/octoprint/plugins/cura/profile.py @@ -7,7 +7,9 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms import re + from builtins import range +from past.builtins import basestring class SupportLocationTypes(object): NONE = "none" diff --git a/src/octoprint/printer/standard.py b/src/octoprint/printer/standard.py index 45c309c7..75e6798b 100644 --- a/src/octoprint/printer/standard.py +++ b/src/octoprint/printer/standard.py @@ -15,6 +15,8 @@ import os import threading import time +from past.builtins import basestring + from octoprint import util as util from octoprint.events import eventManager, Events from octoprint.filemanager import FileDestinations, NoSuchStorage, valid_file_type diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py index 4f17e23c..5d5537cc 100644 --- a/src/octoprint/server/__init__.py +++ b/src/octoprint/server/__init__.py @@ -16,7 +16,9 @@ from babel import Locale from watchdog.observers import Observer from watchdog.observers.polling import PollingObserver from collections import defaultdict + from builtins import bytes, range +from past.builtins import basestring import os import logging diff --git a/src/octoprint/server/api/printer_profiles.py b/src/octoprint/server/api/printer_profiles.py index 7b286f31..5e493330 100644 --- a/src/octoprint/server/api/printer_profiles.py +++ b/src/octoprint/server/api/printer_profiles.py @@ -11,6 +11,8 @@ import copy from flask import jsonify, make_response, request, url_for from werkzeug.exceptions import BadRequest +from past.builtins import basestring + from octoprint.server.api import api, NO_CONTENT, valid_boolean_trues from octoprint.server.util.flask import restricted_access, with_revalidation_checking from octoprint.util import dict_merge @@ -18,7 +20,6 @@ from octoprint.util import dict_merge from octoprint.server import printerProfileManager from octoprint.printer.profile import InvalidProfileError, CouldNotOverwriteError, SaveError - def _lastmodified(): return printerProfileManager.last_modified diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py index 5f41d661..8aa9ebeb 100644 --- a/src/octoprint/server/util/flask.py +++ b/src/octoprint/server/util/flask.py @@ -29,6 +29,8 @@ import octoprint.plugin from werkzeug.contrib.cache import BaseCache +from past.builtins import basestring + try: from os import scandir, walk except ImportError: diff --git a/src/octoprint/server/views.py b/src/octoprint/server/views.py index 2e8a25c0..f2504a32 100644 --- a/src/octoprint/server/views.py +++ b/src/octoprint/server/views.py @@ -9,6 +9,8 @@ import os import datetime import codecs +from past.builtins import basestring + from collections import defaultdict from flask import request, g, url_for, make_response, render_template, send_from_directory, redirect, abort diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py index e1a9fda9..0b15fa3d 100644 --- a/src/octoprint/settings.py +++ b/src/octoprint/settings.py @@ -34,6 +34,7 @@ import copy import time from builtins import bytes +from past.builtins import basestring try: from collections import ChainMap diff --git a/src/octoprint/util/__init__.py b/src/octoprint/util/__init__.py index 0cdb9aa6..b2459a42 100644 --- a/src/octoprint/util/__init__.py +++ b/src/octoprint/util/__init__.py @@ -21,11 +21,14 @@ import threading from functools import wraps import warnings import contextlib + try: import queue except ImportError: import Queue as queue +from past.builtins import basestring + logger = logging.getLogger(__name__) def warning_decorator_factory(warning_type): diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index 32f2a8ad..f99e1e31 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -10,10 +10,13 @@ import glob import time import re import threading + try: import queue except ImportError: import Queue as queue +from past.builtins import basestring + import logging import serial import octoprint.plugin