remove cmp due to deprecated in python3
Cc: Liming Gao <[email protected]>
Cc: Yonghong Zhu <[email protected]>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <[email protected]>
---
BaseTools/Source/Python/AutoGen/AutoGen.py | 6 +++---
BaseTools/Source/Python/BPDG/GenVpd.py | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py
b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 06ff84b4cd..a926a27c6e 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -997,11 +997,11 @@ class WorkspaceAutoGen(AutoGen):
#
def _CheckAllPcdsTokenValueConflict(self):
for Pa in self.AutoGenObjectList:
for Package in Pa.PackageList:
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
while (Count < len(PcdList) - 1) :
Item = PcdList[Count]
ItemNext = PcdList[Count + 1]
#
@@ -1018,11 +1018,11 @@ class WorkspaceAutoGen(AutoGen):
else:
break;
#
# 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
while (SameTokenValuePcdListCount <
len(SameTokenValuePcdList) - 1):
Flag = False
TemListItem =
SameTokenValuePcdList[SameTokenValuePcdListCount]
TemListItemNext =
SameTokenValuePcdList[SameTokenValuePcdListCount + 1]
@@ -1043,11 +1043,11 @@ class WorkspaceAutoGen(AutoGen):
SameTokenValuePcdListCount += 1
Count += SameTokenValuePcdListCount
Count += 1
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
while (Count < len(PcdList) - 1) :
Item = PcdList[Count]
ItemNext = PcdList[Count + 1]
#
diff --git a/BaseTools/Source/Python/BPDG/GenVpd.py
b/BaseTools/Source/Python/BPDG/GenVpd.py
index cd272a2d9a..c5e91a3e81 100644
--- a/BaseTools/Source/Python/BPDG/GenVpd.py
+++ b/BaseTools/Source/Python/BPDG/GenVpd.py
@@ -502,16 +502,16 @@ class GenVPD :
def FixVpdOffset (self):
# At first, the offset should start at 0
# Sort fixed offset list in order to find out where has free spaces
for the pcd's offset
# 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.
#
- self.PcdUnknownOffsetList.sort(lambda x, y: cmp(x.PcdBinSize,
y.PcdBinSize))
+ self.PcdUnknownOffsetList.sort(key=lambda x: x.PcdBinSize)
index =0
for pcd in self.PcdUnknownOffsetList:
index += 1
if pcd.PcdCName == ".".join(("gEfiMdeModulePkgTokenSpaceGuid",
"PcdNvStoreDefaultValueBuffer")):
--
2.12.2.windows.2
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
