Thanks, this patch looks good.
A minor comment that for the following part, would you please move the with
block into a try... except block?
def __RetrievePcdValue(self):
-Content = open(str(self.MetaFile), 'r').readlines()
+with open(str(self.MetaFile), 'r') as File:
+Content = File.readlines()
Thanks,
Bob
-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org]
Sent: Friday, November 2, 2018 9:13 AM
To: edk2-devel@lists.01.org
Cc: Gao, Liming
Subject: [edk2] [PATCH v2 1/1] BaseTools: Explicitly close files after readlines
From: mjohn4
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
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Johnson
---
BaseTools/Source/Python/AutoGen/InfSectionParser.py | 3 ++-
BaseTools/Source/Python/Workspace/MetaFileParser.py | 12
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/BaseTools/Source/Python/AutoGen/InfSectionParser.py
b/BaseTools/Source/Python/AutoGen/InfSectionParser.py
index d985089738..69f0bc8ee9 100644
--- a/BaseTools/Source/Python/AutoGen/InfSectionParser.py
+++ b/BaseTools/Source/Python/AutoGen/InfSectionParser.py
@@ -34,7 +34,8 @@ class InfSectionParser():
SectionData = []
try:
-FileLinesList = open(self._FilePath, "r", 0).readlines()
+with open(self._FilePath, "r", 0) as File:
+FileLinesList = File.readlines()
except BaseException:
EdkLogger.error("build", AUTOGEN_ERROR, 'File %s is opened
failed.' % self._FilePath)
diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py
b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 804a4aa5cb..374886b8b6 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -537,7 +537,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)
@@ -917,7 +918,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)
@@ -1429,7 +1431,8 @@ class DscParser(MetaFileParser):
self._SubsectionType = MODEL_UNKNOWN
def __RetrievePcdValue(self):
-Content = open(str(self.MetaFile), 'r').readlines()
+with open(str(self.MetaFile), 'r') as File:
+Content = File.readlines()
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, @@ -1727,7 +1730,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)
--
2.18.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
