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 79e3180d5e77d79f867c9da239807e84854c6fd0..470cfed5b6a35f9243196ef6288f6dfa0ec17e1a 100644 (file)
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -15,8 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import print_function\r
-from __future__ import absolute_import\r
 import Common.LongFilePathOs as os\r
 import re\r
 import time\r
@@ -141,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
@@ -213,11 +211,13 @@ class MetaFileParser(object):
         self._PostProcessed = True\r
 \r
     ## Get the parse complete flag\r
-    def _GetFinished(self):\r
+    @property\r
+    def Finished(self):\r
         return self._Finished\r
 \r
     ## Set the complete flag\r
-    def _SetFinished(self, Value):\r
+    @Finished.setter\r
+    def Finished(self, Value):\r
         self._Finished = Value\r
 \r
     ## Remove records that do not match given Filter Arch\r
@@ -416,7 +416,9 @@ class MetaFileParser(object):
                 )\r
     def GetValidExpression(self, TokenSpaceGuid, PcdCName):\r
         return self._Table.GetValidExpression(TokenSpaceGuid, PcdCName)\r
-    def _GetMacros(self):\r
+\r
+    @property\r
+    def _Macros(self):\r
         Macros = {}\r
         Macros.update(self._FileLocalMacros)\r
         Macros.update(self._GetApplicableSectionMacro())\r
@@ -478,9 +480,6 @@ class MetaFileParser(object):
         return Macros\r
 \r
     _SectionParser = {}\r
-    Finished = property(_GetFinished, _SetFinished)\r
-    _Macros = property(_GetMacros)\r
-\r
 \r
 ## INF file parser class\r
 #\r
@@ -1252,7 +1251,8 @@ class DscParser(MetaFileParser):
                 )\r
 \r
     ## Override parent's method since we'll do all macro replacements in parser\r
-    def _GetMacros(self):\r
+    @property\r
+    def _Macros(self):\r
         Macros = {}\r
         Macros.update(self._FileLocalMacros)\r
         Macros.update(self._GetApplicableSectionMacro())\r
@@ -1673,8 +1673,6 @@ class DscParser(MetaFileParser):
         MODEL_META_DATA_SUBSECTION_HEADER               :   _SubsectionHeaderParser,\r
     }\r
 \r
-    _Macros = property(_GetMacros)\r
-\r
 ## DEC file parser class\r
 #\r
 #   @param      FilePath        The path of platform description file\r
@@ -1933,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