BaseTools: Various typo

[mirror_edk2.git] / BaseTools / Source / Python / UPT / GenMetaFile / GenInfFile.py

diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
index b62c70513774395ba72d71a5cdd78bfb19fc549c..40346b0b3a52424551025ee8126781786429a1c7 100644 (file)
--- a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
+++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
@@ -18,7 +18,7 @@ GenInf
 import os\r
 import stat\r
 import codecs\r
-import md5\r
+from hashlib import md5\r
 from Core.FileHook import __FileHookOpen__\r
 from Library.StringUtils import GetSplitValueList\r
 from Library.Parsing import GenSection\r
@@ -255,8 +255,8 @@ def GenModuleUNIEncodeFile(ModuleObject, UniFileHeader='', Encoding=DT.TAB_ENCOD
         File = codecs.open(ContainerFile, 'wb', Encoding)\r
         File.write(u'\uFEFF' + Content)\r
         File.stream.close()\r
-    Md5Sigature = md5.new(__FileHookOpen__(str(ContainerFile), 'rb').read())\r
-    Md5Sum = Md5Sigature.hexdigest()\r
+    Md5Signature = md5(__FileHookOpen__(str(ContainerFile), 'rb').read())\r
+    Md5Sum = Md5Signature.hexdigest()\r
     if (ContainerFile, Md5Sum) not in ModuleObject.FileList:\r
         ModuleObject.FileList.append((ContainerFile, Md5Sum))\r
 \r
@@ -274,7 +274,7 @@ def GenDefines(ModuleObject):
         if not DefinesDict:\r
             continue\r
         for Statement in DefinesDict:\r
-            if Statement.split(DT.TAB_EQUAL_SPLIT) > 1:\r
+            if len(Statement.split(DT.TAB_EQUAL_SPLIT)) > 1:\r
                 Statement = (u'%s ' % Statement.split(DT.TAB_EQUAL_SPLIT, 1)[0]).ljust(LeftOffset) \\r
                              + u'= %s' % Statement.split(DT.TAB_EQUAL_SPLIT, 1)[1].lstrip()\r
             SortedArch = DT.TAB_ARCH_COMMON\r
@@ -409,7 +409,7 @@ def GenLibraryClasses(ModuleObject):
                 Statement += '|' + FFE\r
             ModuleList = LibraryClass.GetSupModuleList()\r
             ArchList = LibraryClass.GetSupArchList()\r
-            for Index in xrange(0, len(ArchList)):\r
+            for Index in range(0, len(ArchList)):\r
                 ArchList[Index] = ConvertArchForInstall(ArchList[Index])\r
             ArchList.sort()\r
             SortedArch = ' '.join(ArchList)\r
@@ -572,7 +572,7 @@ def GenUserExtensions(ModuleObject):
 #         if not Statement:\r
 #             continue\r
         ArchList = UserExtension.GetSupArchList()\r
-        for Index in xrange(0, len(ArchList)):\r
+        for Index in range(0, len(ArchList)):\r
             ArchList[Index] = ConvertArchForInstall(ArchList[Index])\r
         ArchList.sort()\r
         KeyList = []\r