mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			Merge pull request #9964 from bridadan/fix_references_to_basestring
Add imports of basestring for python 3pull/10081/head
						commit
						97204b6914
					
				| 
						 | 
					@ -21,6 +21,7 @@ from os.path import join, abspath, dirname, normpath
 | 
				
			||||||
from optparse import OptionParser
 | 
					from optparse import OptionParser
 | 
				
			||||||
import json
 | 
					import json
 | 
				
			||||||
from shutil import copy
 | 
					from shutil import copy
 | 
				
			||||||
 | 
					from past.builtins import basestring
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Be sure that the tools directory is in the search path
 | 
					# Be sure that the tools directory is in the search path
 | 
				
			||||||
ROOT = abspath(join(dirname(__file__), ".."))
 | 
					ROOT = abspath(join(dirname(__file__), ".."))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -24,6 +24,7 @@ from os import makedirs, walk
 | 
				
			||||||
import copy
 | 
					import copy
 | 
				
			||||||
from shutil import rmtree, copyfile
 | 
					from shutil import rmtree, copyfile
 | 
				
			||||||
import zipfile
 | 
					import zipfile
 | 
				
			||||||
 | 
					from past.builtins import basestring
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from ..resources import Resources, FileType, FileRef
 | 
					from ..resources import Resources, FileType, FileRef
 | 
				
			||||||
from ..config import ALLOWED_FEATURES
 | 
					from ..config import ALLOWED_FEATURES
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,6 +29,7 @@ if __name__ == "__main__":
 | 
				
			||||||
from copy import copy
 | 
					from copy import copy
 | 
				
			||||||
from yaml import dump_all
 | 
					from yaml import dump_all
 | 
				
			||||||
import argparse
 | 
					import argparse
 | 
				
			||||||
 | 
					from past.builtins import basestring
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from tools.targets import Target, set_targets_json_location, TARGET_MAP
 | 
					from tools.targets import Target, set_targets_json_location, TARGET_MAP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -274,4 +275,3 @@ def main():
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if __name__ == "__main__":
 | 
					if __name__ == "__main__":
 | 
				
			||||||
    sys.exit(main())
 | 
					    sys.exit(main())
 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue