sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: remove cmp due to deprecated in python3

Browse Source 
remove cmp due to deprecated in python3

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Feng, YunhuaX
2018-08-08 14:56:14 +08:00
committed by Yonghong Zhu
parent abb8e6e97a
commit 87010d3d02
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BaseTools/Source/Python/AutoGen/AutoGen.py
View File

@ -870,7 +870,7 @@ class WorkspaceAutoGen(AutoGen):
for Pa in self.AutoGenObjectList: for Pa in self.AutoGenObjectList:
for Package in Pa.PackageList: for Package in Pa.PackageList:
PcdList = Package.Pcds.values() PcdList = Package.Pcds.values()
PcdList.sort(lambda x, y: cmp(int(x.TokenValue, 0), int(y.TokenValue, 0))) PcdList.sort(key=lambda x: int(x.TokenValue, 0))
Count = 0 Count = 0
while (Count < len(PcdList) - 1) : while (Count < len(PcdList) - 1) :
Item = PcdList[Count] Item = PcdList[Count]
@ -891,7 +891,7 @@ class WorkspaceAutoGen(AutoGen):
# #
# Sort same token value PCD list with TokenGuid and TokenCName # Sort same token value PCD list with TokenGuid and TokenCName
# #
SameTokenValuePcdList.sort(lambda x, y: cmp("%s.%s" % (x.TokenSpaceGuidCName, x.TokenCName), "%s.%s" % (y.TokenSpaceGuidCName, y.TokenCName))) SameTokenValuePcdList.sort(key=lambda x: "%s.%s" % (x.TokenSpaceGuidCName, x.TokenCName))
SameTokenValuePcdListCount = 0 SameTokenValuePcdListCount = 0
while (SameTokenValuePcdListCount < len(SameTokenValuePcdList) - 1): while (SameTokenValuePcdListCount < len(SameTokenValuePcdList) - 1):
Flag = False Flag = False
@ -916,7 +916,7 @@ class WorkspaceAutoGen(AutoGen):
Count += 1 Count += 1
PcdList = Package.Pcds.values() PcdList = Package.Pcds.values()
PcdList.sort(lambda x, y: cmp("%s.%s" % (x.TokenSpaceGuidCName, x.TokenCName), "%s.%s" % (y.TokenSpaceGuidCName, y.TokenCName))) PcdList.sort(key=lambda x: "%s.%s" % (x.TokenSpaceGuidCName, x.TokenCName))
Count = 0 Count = 0
while (Count < len(PcdList) - 1) : while (Count < len(PcdList) - 1) :
Item = PcdList[Count] Item = PcdList[Count]

4
BaseTools/Source/Python/BPDG/GenVpd.py
View File

@ -504,12 +504,12 @@ class GenVPD :
# Sort fixed offset list in order to find out where has free spaces for the pcd's offset # Sort fixed offset list in order to find out where has free spaces for the pcd's offset
# value is "*" to insert into. # value is "*" to insert into.
self.PcdFixedOffsetSizeList.sort(lambda x, y: cmp(x.PcdBinOffset, y.PcdBinOffset)) self.PcdFixedOffsetSizeList.sort(key=lambda x: x.PcdBinOffset)
# #
# Sort the un-fixed pcd's offset by it's size. # Sort the un-fixed pcd's offset by it's size.
# #
self.PcdUnknownOffsetList.sort(lambda x, y: cmp(x.PcdBinSize, y.PcdBinSize)) self.PcdUnknownOffsetList.sort(key=lambda x: x.PcdBinSize)
index =0 index =0
for pcd in self.PcdUnknownOffsetList: for pcd in self.PcdUnknownOffsetList: