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>

2 files changed, 2 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/UPT/Xml/IniToXml.py b/BaseTools/Source/Python/UPT/Xml/IniToXml.py
index 8125f183be..70d8fb19f2 100644
--- a/BaseTools/Source/Python/UPT/Xml/IniToXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/IniToXml.py
@@ -326,7 +326,7 @@ def IniToXml(IniFile):
     CurrentKey = ''

     PreMap = None

     Map = None

-    FileContent = ConvertSpecialChar(open(IniFile, 'r').readlines())

+    FileContent = ConvertSpecialChar(open(IniFile, 'rb').readlines())

     LastIndex = 0

     for Index in range(0, len(FileContent)):

         LastIndex = Index

diff --git a/BaseTools/Source/Python/UPT/Xml/XmlParserMisc.py b/BaseTools/Source/Python/UPT/Xml/XmlParserMisc.py
index bf64d89f17..d170761aad 100644
--- a/BaseTools/Source/Python/UPT/Xml/XmlParserMisc.py
+++ b/BaseTools/Source/Python/UPT/Xml/XmlParserMisc.py
@@ -53,7 +53,7 @@ def ConvertVariableName(VariableName):
         if SecondByte != 0:

             return None

 

-        if FirstByte not in range(0x20, 0x7F):

+        if FirstByte not in xrange(0x20, 0x7F):

             return None

         TransferedStr += ('%c')%FirstByte

         Index = Index + 2