Py3: basestring => past.builtins.basestring

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 <http://click.pocoo.org/5/api/#click.MultiCommand>`_

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")
 

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

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):
 	"""

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"

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

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

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
 

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:

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
 

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

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):

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