From 0d1f5b2b5dc3c1cf381be0a1ec8f960dc6029a93 Mon Sep 17 00:00:00 2001 From: Gary Lin Date: Mon, 25 Jun 2018 18:31:35 +0800 Subject: BaseTools: Fix old python2 idioms Based on "futurize -f lib2to3.fixes.fix_idioms" * Change some type comparisons to isinstance() calls: type(x) == T -> isinstance(x, T) type(x) is T -> isinstance(x, T) type(x) != T -> not isinstance(x, T) type(x) is not T -> not isinstance(x, T) * Change "while 1:" into "while True:". * Change both v = list(EXPR) v.sort() foo(v) and the more general v = EXPR v.sort() foo(v) into v = sorted(EXPR) foo(v) Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin Reviewed-by: Yonghong Zhu --- BaseTools/Source/Python/Common/RangeExpression.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'BaseTools/Source/Python/Common/RangeExpression.py') diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py index 1cf975ba7b..014c75b8ce 100644 --- a/BaseTools/Source/Python/Common/RangeExpression.py +++ b/BaseTools/Source/Python/Common/RangeExpression.py @@ -97,7 +97,7 @@ class XOROperatorObject(object): def __init__(self): pass def Calculate(self, Operand, DataType, SymbolTable): - if type(Operand) == type('') and not Operand.isalnum(): + if isinstance(Operand, type('')) and not Operand.isalnum(): Expr = "XOR ..." raise BadExpression(ERR_SNYTAX % Expr) rangeId = str(uuid.uuid1()) @@ -111,7 +111,7 @@ class LEOperatorObject(object): def __init__(self): pass def Calculate(self, Operand, DataType, SymbolTable): - if type(Operand) == type('') and not Operand.isalnum(): + if isinstance(Operand, type('')) and not Operand.isalnum(): Expr = "LE ..." raise BadExpression(ERR_SNYTAX % Expr) rangeId1 = str(uuid.uuid1()) @@ -123,7 +123,7 @@ class LTOperatorObject(object): def __init__(self): pass def Calculate(self, Operand, DataType, SymbolTable): - if type(Operand) == type('') and not Operand.isalnum(): + if isinstance(Operand, type('')) and not Operand.isalnum(): Expr = "LT ..." raise BadExpression(ERR_SNYTAX % Expr) rangeId1 = str(uuid.uuid1()) @@ -136,7 +136,7 @@ class GEOperatorObject(object): def __init__(self): pass def Calculate(self, Operand, DataType, SymbolTable): - if type(Operand) == type('') and not Operand.isalnum(): + if isinstance(Operand, type('')) and not Operand.isalnum(): Expr = "GE ..." raise BadExpression(ERR_SNYTAX % Expr) rangeId1 = str(uuid.uuid1()) @@ -149,7 +149,7 @@ class GTOperatorObject(object): def __init__(self): pass def Calculate(self, Operand, DataType, SymbolTable): - if type(Operand) == type('') and not Operand.isalnum(): + if isinstance(Operand, type('')) and not Operand.isalnum(): Expr = "GT ..." raise BadExpression(ERR_SNYTAX % Expr) rangeId1 = str(uuid.uuid1()) @@ -162,7 +162,7 @@ class EQOperatorObject(object): def __init__(self): pass def Calculate(self, Operand, DataType, SymbolTable): - if type(Operand) == type('') and not Operand.isalnum(): + if isinstance(Operand, type('')) and not Operand.isalnum(): Expr = "EQ ..." raise BadExpression(ERR_SNYTAX % Expr) rangeId1 = str(uuid.uuid1()) @@ -350,7 +350,7 @@ class RangeExpression(BaseExpression): def __init__(self, Expression, PcdDataType, SymbolTable = {}): super(RangeExpression, self).__init__(self, Expression, PcdDataType, SymbolTable) self._NoProcess = False - if type(Expression) != type(''): + if not isinstance(Expression, type('')): self._Expr = Expression self._NoProcess = True return @@ -571,7 +571,7 @@ class RangeExpression(BaseExpression): Ex.Pcd = self._Token raise Ex self._Token = RangeExpression(self._Symb[self._Token], self._Symb)(True, self._Depth + 1) - if type(self._Token) != type(''): + if not isinstance(self._Token, type('')): self._LiteralToken = hex(self._Token) return -- cgit v1.2.3