TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: Fix unclosed file handles

Browse Source
This commit is contained in:
rdb 2021-12-04 20:43:07 +01:00
parent 24755bc8eb
commit 420d1cee61
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
makepanda/makepandacore.py
View File

@ -1599,8 +1599,8 @@ def PkgConfigGetIncDirs(pkgname, tool = "pkg-config"):
else: else:
handle = os.popen(LocateBinary(tool) + " --cflags") handle = os.popen(LocateBinary(tool) + " --cflags")
result = handle.read().strip() result = handle.read().strip()
if len(result) == 0: return []
handle.close() handle.close()
if len(result) == 0: return []
dirs = [] dirs = []
for opt in result.split(" "): for opt in result.split(" "):
if (opt.startswith("-I")): if (opt.startswith("-I")):
@ -3637,7 +3637,8 @@ def UpdatePythonVersionInfoFile(new_info):
json_data = [] json_data = []
if os.path.isfile(json_file) and not PkgSkip("PYTHON"): if os.path.isfile(json_file) and not PkgSkip("PYTHON"):
try: try:
json_data = json.load(open(json_file, 'r')) with open(json_file, 'r') as fh:
json_data = json.load(fh)
except: except:
json_data = [] json_data = []
@ -3655,7 +3656,9 @@ def UpdatePythonVersionInfoFile(new_info):
if VERBOSE: if VERBOSE:
print("Writing %s" % (json_file)) print("Writing %s" % (json_file))
json.dump(json_data, open(json_file, 'w'), indent=4)
with open(json_file, 'w') as fh:
json.dump(json_data, fh, indent=4)
def ReadPythonVersionInfoFile(): def ReadPythonVersionInfoFile():