From d687cfb22841ba0e1ccf4c946f672dfaeae239cb Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Sat, 10 Nov 2018 18:29:08 +0800 Subject: [Tools] Change building script for Py3 --- tools/package.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/package.py') diff --git a/tools/package.py b/tools/package.py index 55b318b2a3..d49303d048 100644 --- a/tools/package.py +++ b/tools/package.py @@ -28,7 +28,7 @@ from building import * def ExtendPackageVar(package, var): v = [] - if not package.has_key(var): + if var not in package: return v for item in package[var]: @@ -38,7 +38,7 @@ def ExtendPackageVar(package, var): def BuildPackage(package): import json - f = file(package) + f = open(package) package_json = f.read() # get package.json path @@ -47,20 +47,20 @@ def BuildPackage(package): package = json.loads(package_json) # check package name - if not package.has_key('name'): + if 'name' not in package: return [] # get depends depend = ExtendPackageVar(package, 'depends') src = [] - if package.has_key('source_files'): + if 'source_files' in package: for src_file in package['source_files']: src_file = os.path.join(cwd, src_file) src += Glob(src_file) CPPPATH = [] - if package.has_key('CPPPATH'): + if 'CPPPATH' in package: for path in package['CPPPATH']: if path.startswith('/') and os.path.isdir(path): CPPPATH = CPPPATH + [path] -- cgit v1.3.1