BaseTools: Adjust the spaces around commas and colons
Based on "futurize -f lib2to3.fixes.fix_ws_comma" Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu <yonghong.zhu@intel.com> Cc: Liming Gao <liming.gao@intel.com> Signed-off-by: Gary Lin <glin@suse.com> Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
@@ -285,8 +285,8 @@ class DependencyRules(object):
|
||||
pass
|
||||
DecPath = dirname(DecFile)
|
||||
if DecPath.find(WorkSP) > -1:
|
||||
InstallPath = GetRelativePath(DecPath,WorkSP)
|
||||
DecFileRelaPath = GetRelativePath(DecFile,WorkSP)
|
||||
InstallPath = GetRelativePath(DecPath, WorkSP)
|
||||
DecFileRelaPath = GetRelativePath(DecFile, WorkSP)
|
||||
else:
|
||||
InstallPath = DecPath
|
||||
DecFileRelaPath = DecFile
|
||||
@@ -348,8 +348,8 @@ class DependencyRules(object):
|
||||
pass
|
||||
DecPath = dirname(DecFile)
|
||||
if DecPath.find(WorkSP) > -1:
|
||||
InstallPath = GetRelativePath(DecPath,WorkSP)
|
||||
DecFileRelaPath = GetRelativePath(DecFile,WorkSP)
|
||||
InstallPath = GetRelativePath(DecPath, WorkSP)
|
||||
DecFileRelaPath = GetRelativePath(DecFile, WorkSP)
|
||||
else:
|
||||
InstallPath = DecPath
|
||||
DecFileRelaPath = DecFile
|
||||
|
@@ -459,7 +459,7 @@ class IpiDatabase(object):
|
||||
(select InstallPath from ModInPkgInfo where
|
||||
ModInPkgInfo.PackageGuid ='%s'
|
||||
and ModInPkgInfo.PackageVersion = '%s')""" \
|
||||
% (Pkg[0], Pkg[1], Pkg[0], Pkg[1], Pkg[0], Pkg[1],Pkg[0], Pkg[1])
|
||||
% (Pkg[0], Pkg[1], Pkg[0], Pkg[1], Pkg[0], Pkg[1], Pkg[0], Pkg[1])
|
||||
|
||||
self.Cur.execute(SqlCommand)
|
||||
#
|
||||
@@ -921,7 +921,7 @@ class IpiDatabase(object):
|
||||
def __ConvertToSqlString(self, StringList):
|
||||
if self.DpTable:
|
||||
pass
|
||||
return map(lambda s: s.replace("'", "''") , StringList)
|
||||
return map(lambda s: s.replace("'", "''"), StringList)
|
||||
|
||||
|
||||
|
||||
|
@@ -632,7 +632,7 @@ def SplitString(String):
|
||||
# @param StringList: A list for strings to be converted
|
||||
#
|
||||
def ConvertToSqlString(StringList):
|
||||
return map(lambda s: s.replace("'", "''") , StringList)
|
||||
return map(lambda s: s.replace("'", "''"), StringList)
|
||||
|
||||
## Convert To Sql String
|
||||
#
|
||||
|
@@ -648,7 +648,7 @@ class DecPomAlignment(PackageObject):
|
||||
ContainerFile,
|
||||
(Item.TokenSpaceGuidCName, Item.TokenCName,
|
||||
Item.DefaultValue, Item.DatumType, Item.TokenValue,
|
||||
Type, Item.GetHeadComment(), Item.GetTailComment(),''),
|
||||
Type, Item.GetHeadComment(), Item.GetTailComment(), ''),
|
||||
Language,
|
||||
self.DecParser.GetDefineSectionMacro()
|
||||
)
|
||||
|
@@ -314,7 +314,7 @@ def Main():
|
||||
GlobalData.gDB.CloseDb()
|
||||
|
||||
if pf.system() == 'Windows':
|
||||
os.system('subst %s /D' % GlobalData.gWORKSPACE.replace('\\',''))
|
||||
os.system('subst %s /D' % GlobalData.gWORKSPACE.replace('\\', ''))
|
||||
|
||||
return ReturnCode
|
||||
|
||||
|
@@ -355,7 +355,7 @@ class PackageHeaderXml(object):
|
||||
def FromXml(self, Item, Key, PackageObject2):
|
||||
if not Item:
|
||||
XmlTreeLevel = ['DistributionPackage', 'PackageSurfaceArea']
|
||||
CheckDict = {'PackageHeader':None, }
|
||||
CheckDict = {'PackageHeader': None, }
|
||||
IsRequiredItemListNull(CheckDict, XmlTreeLevel)
|
||||
self.PackagePath = XmlElement(Item, '%s/PackagePath' % Key)
|
||||
self.Header.FromXml(Item, Key)
|
||||
|
@@ -103,7 +103,7 @@ class DistributionPackageXml(object):
|
||||
IsRequiredItemListNull(CheckDict, XmlTreeLevel)
|
||||
else:
|
||||
XmlTreeLevel = ['DistributionPackage', 'DistributionHeader']
|
||||
CheckDict = CheckDict = {'DistributionHeader':'', }
|
||||
CheckDict = CheckDict = {'DistributionHeader': '', }
|
||||
IsRequiredItemListNull(CheckDict, XmlTreeLevel)
|
||||
|
||||
#
|
||||
@@ -123,16 +123,16 @@ class DistributionPackageXml(object):
|
||||
#
|
||||
if self.DistP.Tools:
|
||||
XmlTreeLevel = ['DistributionPackage', 'Tools', 'Header']
|
||||
CheckDict = {'Name':self.DistP.Tools.GetName(), }
|
||||
CheckDict = {'Name': self.DistP.Tools.GetName(), }
|
||||
IsRequiredItemListNull(CheckDict, XmlTreeLevel)
|
||||
|
||||
if not self.DistP.Tools.GetFileList():
|
||||
XmlTreeLevel = ['DistributionPackage', 'Tools']
|
||||
CheckDict = {'FileName':None, }
|
||||
CheckDict = {'FileName': None, }
|
||||
IsRequiredItemListNull(CheckDict, XmlTreeLevel)
|
||||
for Item in self.DistP.Tools.GetFileList():
|
||||
XmlTreeLevel = ['DistributionPackage', 'Tools']
|
||||
CheckDict = {'FileName':Item.GetURI(), }
|
||||
CheckDict = {'FileName': Item.GetURI(), }
|
||||
IsRequiredItemListNull(CheckDict, XmlTreeLevel)
|
||||
|
||||
#
|
||||
@@ -140,16 +140,16 @@ class DistributionPackageXml(object):
|
||||
#
|
||||
if self.DistP.MiscellaneousFiles:
|
||||
XmlTreeLevel = ['DistributionPackage', 'MiscellaneousFiles', 'Header']
|
||||
CheckDict = {'Name':self.DistP.MiscellaneousFiles.GetName(), }
|
||||
CheckDict = {'Name': self.DistP.MiscellaneousFiles.GetName(), }
|
||||
IsRequiredItemListNull(CheckDict, XmlTreeLevel)
|
||||
|
||||
if not self.DistP.MiscellaneousFiles.GetFileList():
|
||||
XmlTreeLevel = ['DistributionPackage', 'MiscellaneousFiles']
|
||||
CheckDict = {'FileName':None, }
|
||||
CheckDict = {'FileName': None, }
|
||||
IsRequiredItemListNull(CheckDict, XmlTreeLevel)
|
||||
for Item in self.DistP.MiscellaneousFiles.GetFileList():
|
||||
XmlTreeLevel = ['DistributionPackage', 'MiscellaneousFiles']
|
||||
CheckDict = {'FileName':Item.GetURI(), }
|
||||
CheckDict = {'FileName': Item.GetURI(), }
|
||||
IsRequiredItemListNull(CheckDict, XmlTreeLevel)
|
||||
|
||||
#
|
||||
@@ -157,7 +157,7 @@ class DistributionPackageXml(object):
|
||||
#
|
||||
for Item in self.DistP.UserExtensions:
|
||||
XmlTreeLevel = ['DistributionPackage', 'UserExtensions']
|
||||
CheckDict = {'UserId':Item.GetUserID(), }
|
||||
CheckDict = {'UserId': Item.GetUserID(), }
|
||||
IsRequiredItemListNull(CheckDict, XmlTreeLevel)
|
||||
|
||||
|
||||
@@ -449,10 +449,10 @@ def ValidateMS1(Module, TopXmlTreeLevel):
|
||||
XmlTreeLevel = TopXmlTreeLevel + ['MiscellaneousFiles']
|
||||
for Item in Module.GetMiscFileList():
|
||||
if not Item.GetFileList():
|
||||
CheckDict = {'Filename':'', }
|
||||
CheckDict = {'Filename': '', }
|
||||
IsRequiredItemListNull(CheckDict, XmlTreeLevel)
|
||||
for File in Item.GetFileList():
|
||||
CheckDict = {'Filename':File.GetURI(), }
|
||||
CheckDict = {'Filename': File.GetURI(), }
|
||||
|
||||
## ValidateMS2
|
||||
#
|
||||
@@ -915,10 +915,10 @@ def ValidatePS2(Package):
|
||||
XmlTreeLevel = ['DistributionPackage', 'PackageSurfaceArea', 'MiscellaneousFiles']
|
||||
for Item in Package.GetMiscFileList():
|
||||
if not Item.GetFileList():
|
||||
CheckDict = {'Filename':'', }
|
||||
CheckDict = {'Filename': '', }
|
||||
IsRequiredItemListNull(CheckDict, XmlTreeLevel)
|
||||
for File in Item.GetFileList():
|
||||
CheckDict = {'Filename':File.GetURI(), }
|
||||
CheckDict = {'Filename': File.GetURI(), }
|
||||
IsRequiredItemListNull(CheckDict, XmlTreeLevel)
|
||||
|
||||
## ValidatePackageSurfaceArea
|
||||
|
Reference in New Issue
Block a user