Merge pull request #9964 from bridadan/fix_references_to_basestring

Add imports of basestring for python 3
pull/10081/head
Cruz Monrreal 2019-03-16 22:55:37 -05:00 committed by GitHub
commit 97204b6914
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions

View File

@ -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__), ".."))

View File

@ -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

View File

@ -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())