Revert BaseTools: PYTHON3 migration

This reverts commit 6693f359b3c213513c5096a06c6f67244a44dc52..
678f85131238622e576705117e299d81cff755c9.

Python3 migration is the fundamental change. It requires every developer
to install Python3. Before this migration, the well communication and wide
verification must be done. But now, most people is not aware of this change,
and not try it. So, Python3 migration is reverted and be moved to edk2-staging
Python3 branch for the edk2 user evaluation.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 470cfed5b6..f1707c06fe 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -15,6 +15,8 @@
 ##

 # Import Modules

 #

+from __future__ import print_function

+from __future__ import absolute_import

 import Common.LongFilePathOs as os

 import re

 import time

@@ -139,7 +141,7 @@ class MetaFileParser(object):
         if FilePath in Class.MetaFiles:

             return Class.MetaFiles[FilePath]

         else:

-            ParserObject = super().__new__(Class)

+            ParserObject = super(MetaFileParser, Class).__new__(Class)

             Class.MetaFiles[FilePath] = ParserObject

             return ParserObject

 

@@ -1931,10 +1933,10 @@ class DecParser(MetaFileParser):
                     return

 

                 if self._include_flag:

-                    self._ValueList[1] = "<HeaderFiles>_" + md5(self._CurrentLine.encode('utf-8')).hexdigest()

+                    self._ValueList[1] = "<HeaderFiles>_" + md5(self._CurrentLine).hexdigest()

                     self._ValueList[2] = self._CurrentLine

                 if self._package_flag and "}" != self._CurrentLine:

-                    self._ValueList[1] = "<Packages>_" + md5(self._CurrentLine.encode('utf-8')).hexdigest()

+                    self._ValueList[1] = "<Packages>_" + md5(self._CurrentLine).hexdigest()

                     self._ValueList[2] = self._CurrentLine

                 if self._CurrentLine == "}":

                     self._package_flag = False