From 0105395be2794c87eaa091bd1351827167d85af4 Mon Sep 17 00:00:00 2001 From: Brian Daniels Date: Wed, 6 Mar 2019 09:33:02 -0600 Subject: [PATCH] Add imports of basestring for python 3 --- tools/build_release.py | 1 + tools/export/__init__.py | 1 + tools/targets/lint.py | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/build_release.py b/tools/build_release.py index 92a4d459bb..0680589031 100644 --- a/tools/build_release.py +++ b/tools/build_release.py @@ -21,6 +21,7 @@ from os.path import join, abspath, dirname, normpath from optparse import OptionParser import json from shutil import copy +from past.builtins import basestring # Be sure that the tools directory is in the search path ROOT = abspath(join(dirname(__file__), "..")) diff --git a/tools/export/__init__.py b/tools/export/__init__.py index ae3c463c99..97531f59c4 100644 --- a/tools/export/__init__.py +++ b/tools/export/__init__.py @@ -24,6 +24,7 @@ from os import makedirs, walk import copy from shutil import rmtree, copyfile import zipfile +from past.builtins import basestring from ..resources import Resources, FileType, FileRef from ..config import ALLOWED_FEATURES diff --git a/tools/targets/lint.py b/tools/targets/lint.py index 2ab915a610..885513f158 100644 --- a/tools/targets/lint.py +++ b/tools/targets/lint.py @@ -29,6 +29,7 @@ if __name__ == "__main__": from copy import copy from yaml import dump_all import argparse +from past.builtins import basestring from tools.targets import Target, set_targets_json_location, TARGET_MAP @@ -274,4 +275,3 @@ def main(): if __name__ == "__main__": sys.exit(main()) -