tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: Explicitly close files after readlines 

Rework some file open().readlines to open, readlines, close.
This prevents excessive file handles being open at the same time,
which may be a problem with alternative python environments.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Johnson <michael.johnson@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
mjohn4 2018-11-02 10:02:10 +08:00 committed by Feng, Bob C
parent dbe05cb1c0
commit b0189eac00
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BaseTools/Source/Python/AutoGen/InfSectionParser.py
View File

@ -34,7 +34,8 @@ class InfSectionParser():
SectionData = []
try:
FileLinesList = open(self._FilePath, "r").readlines()
with open(self._FilePath, "r") as File:
FileLinesList = File.readlines()
except BaseException:
EdkLogger.error("build", AUTOGEN_ERROR, 'File %s is opened failed.' % self._FilePath)

16
BaseTools/Source/Python/Workspace/MetaFileParser.py
View File

@ -576,7 +576,8 @@ class InfParser(MetaFileParser):
NmakeLine = ''
Content = ''
try:
Content = open(str(self.MetaFile), 'r').readlines()
with open(str(self.MetaFile), 'r') as File:
Content = File.readlines()
except:
EdkLogger.error("Parser", FILE_READ_FAILURE, ExtraData=self.MetaFile)
@ -950,7 +951,8 @@ class DscParser(MetaFileParser):
def Start(self):
Content = ''
try:
Content = open(str(self.MetaFile), 'r').readlines()
with open(str(self.MetaFile), 'r') as File:
Content = File.readlines()
except:
EdkLogger.error("Parser", FILE_READ_FAILURE, ExtraData=self.MetaFile)
@ -1493,7 +1495,12 @@ class DscParser(MetaFileParser):
self._SubsectionType = MODEL_UNKNOWN
def __RetrievePcdValue(self):
Content = open(str(self.MetaFile), 'r').readlines()
try:
with open(str(self.MetaFile), 'r') as File:
Content = File.readlines()
except:
EdkLogger.error("Parser", FILE_READ_FAILURE, ExtraData=self.MetaFile)
GlobalData.gPlatformOtherPcds['DSCFILE'] = str(self.MetaFile)
for PcdType in (MODEL_PCD_PATCHABLE_IN_MODULE, MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_HII,
MODEL_PCD_DYNAMIC_VPD, MODEL_PCD_DYNAMIC_EX_DEFAULT, MODEL_PCD_DYNAMIC_EX_HII,
@ -1786,7 +1793,8 @@ class DecParser(MetaFileParser):
def Start(self):
Content = ''
try:
Content = open(str(self.MetaFile), 'r').readlines()
with open(str(self.MetaFile), 'r') as File:
Content = File.readlines()
except:
EdkLogger.error("Parser", FILE_READ_FAILURE, ExtraData=self.MetaFile)