BaseTools: Not compare the VOID* difference in the DSC and DEC file

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / MetaFileParser.py

diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index a3ff733f7e2c9581a66e57f60513192d093fe15f..470cfed5b6a35f9243196ef6288f6dfa0ec17e1a 100644 (file)
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -139,7 +139,7 @@ class MetaFileParser(object):
         if FilePath in Class.MetaFiles:\r
             return Class.MetaFiles[FilePath]\r
         else:\r
-            ParserObject = super(MetaFileParser, Class).__new__(Class)\r
+            ParserObject = super().__new__(Class)\r
             Class.MetaFiles[FilePath] = ParserObject\r
             return ParserObject\r
 \r
@@ -1931,10 +1931,10 @@ class DecParser(MetaFileParser):
                     return\r
 \r
                 if self._include_flag:\r
-                    self._ValueList[1] = "<HeaderFiles>_" + md5(self._CurrentLine).hexdigest()\r
+                    self._ValueList[1] = "<HeaderFiles>_" + md5(self._CurrentLine.encode('utf-8')).hexdigest()\r
                     self._ValueList[2] = self._CurrentLine\r
                 if self._package_flag and "}" != self._CurrentLine:\r
-                    self._ValueList[1] = "<Packages>_" + md5(self._CurrentLine).hexdigest()\r
+                    self._ValueList[1] = "<Packages>_" + md5(self._CurrentLine.encode('utf-8')).hexdigest()\r
                     self._ValueList[2] = self._CurrentLine\r
                 if self._CurrentLine == "}":\r
                     self._package_flag = False\r