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

BaseTools: AutoGen - UniClassObject refactor static methods

Browse Source 
change methods which do not use self to @staticmethod
change their calls to use class name instead of instance

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Carsey, Jaben
2018-04-28 06:32:27 +08:00
committed by Yonghong Zhu
parent 124d672ee6
commit 3b743b3b15
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
BaseTools/Source/Python/AutoGen/UniClassObject.py
View File

@ -253,7 +253,7 @@ class UniFileClassObject(object):
Lang = distutils.util.split_quoted((Line.split(u"//")[0])) Lang = distutils.util.split_quoted((Line.split(u"//")[0]))
if len(Lang) != 3: if len(Lang) != 3:
try: try:
FileIn = self.OpenUniFile(LongFilePath(File.Path)) FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))
except UnicodeError, X: except UnicodeError, X:
EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File); EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File);
except: except:
@ -297,7 +297,8 @@ class UniFileClassObject(object):
self.OrderedStringDict[LangName][Item.StringName] = len(self.OrderedStringList[LangName]) - 1 self.OrderedStringDict[LangName][Item.StringName] = len(self.OrderedStringList[LangName]) - 1
return True return True
def OpenUniFile(self, FileName): @staticmethod
def OpenUniFile(FileName):
# #
# Read file # Read file
# #
@ -316,14 +317,15 @@ class UniFileClassObject(object):
FileIn.startswith(codecs.BOM_UTF16_LE)): FileIn.startswith(codecs.BOM_UTF16_LE)):
Encoding = 'utf-16' Encoding = 'utf-16'
self.VerifyUcs2Data(FileIn, FileName, Encoding) UniFileClassObject.VerifyUcs2Data(FileIn, FileName, Encoding)
UniFile = StringIO.StringIO(FileIn) UniFile = StringIO.StringIO(FileIn)
Info = codecs.lookup(Encoding) Info = codecs.lookup(Encoding)
(Reader, Writer) = (Info.streamreader, Info.streamwriter) (Reader, Writer) = (Info.streamreader, Info.streamwriter)
return codecs.StreamReaderWriter(UniFile, Reader, Writer) return codecs.StreamReaderWriter(UniFile, Reader, Writer)
def VerifyUcs2Data(self, FileIn, FileName, Encoding): @staticmethod
def VerifyUcs2Data(FileIn, FileName, Encoding):
Ucs2Info = codecs.lookup('ucs-2') Ucs2Info = codecs.lookup('ucs-2')
# #
# Convert to unicode # Convert to unicode
@ -390,7 +392,7 @@ class UniFileClassObject(object):
EdkLogger.error("Unicode File Parser", FILE_NOT_FOUND, ExtraData=File.Path) EdkLogger.error("Unicode File Parser", FILE_NOT_FOUND, ExtraData=File.Path)
try: try:
FileIn = self.OpenUniFile(LongFilePath(File.Path)) FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))
except UnicodeError, X: except UnicodeError, X:
EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File.Path); EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File.Path);
except: except: