BaseTools: fix imports
1 - Some of these imports are cascaded from another file. Import them locally. 2 - Some of these imports are not used. Remove them. 3 - Some of these were missing the namespace used to import them. These changes facilitate optimization of BaseTools: https://bugzilla.tianocore.org/show_bug.cgi?id=42 Cc: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey <jaben.carsey@intel.com> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
@ -19,6 +19,7 @@ from CommonDataClass.Exceptions import WrnExpression
|
||||
import uuid
|
||||
from Common.Expression import PcdPattern, BaseExpression
|
||||
from Common.DataType import *
|
||||
from re import compile
|
||||
|
||||
ERR_STRING_EXPR = 'This operator cannot be used in string expression: [%s].'
|
||||
ERR_SNYTAX = 'Syntax error, the rest of expression cannot be evaluated: [%s].'
|
||||
@ -202,7 +203,7 @@ class RangeExpression(BaseExpression):
|
||||
|
||||
NonLetterOpLst = ['+', '-', '&', '|', '^', '!', '=', '>', '<']
|
||||
|
||||
RangePattern = re.compile(r'[0-9]+ - [0-9]+')
|
||||
RangePattern = compile(r'[0-9]+ - [0-9]+')
|
||||
|
||||
def preProcessRangeExpr(self, expr):
|
||||
# convert hex to int
|
||||
|
@ -1,7 +1,7 @@
|
||||
## @file
|
||||
# This file is used to define each component of tools_def.txt file
|
||||
#
|
||||
# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
|
||||
# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>
|
||||
# This program and the accompanying materials
|
||||
# are licensed and made available under the terms and conditions of the BSD License
|
||||
# which accompanies this distribution. The full text of the license may be found at
|
||||
@ -20,7 +20,7 @@ import re
|
||||
from . import EdkLogger
|
||||
|
||||
from .BuildToolError import *
|
||||
from .TargetTxtClassObject import *
|
||||
from Common.TargetTxtClassObject import TargetTxtDict
|
||||
from Common.LongFilePathSupport import OpenLongFilePath as open
|
||||
from Common.Misc import PathClass
|
||||
from Common.StringUtils import NormPath
|
||||
|
Reference in New Issue
Block a user