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, 14 insertions, 1 deletions

diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
index 1c86be4429..384f31b165 100644
--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -16,6 +16,7 @@
 ##

 # Import Modules

 #

+from __future__ import print_function

 import Common.LongFilePathOs as os, codecs, re

 import distutils.util

 import Common.EdkLogger as EdkLogger

@@ -45,6 +46,18 @@ BACK_SLASH_PLACEHOLDER = u'\u0006'
 

 gIncludePattern = re.compile("^#include +[\"<]+([^\"< >]+)[>\"]+$", re.MULTILINE | re.UNICODE)

 

+## Convert a python unicode string to a normal string

+#

+# Convert a python unicode string to a normal string

+# UniToStr(u'I am a string') is 'I am a string'

+#

+# @param Uni:  The python unicode string

+#

+# @retval:     The formatted normal string

+#

+def UniToStr(Uni):

+    return repr(Uni)[2:-1]

+

 ## Convert a unicode string to a Hex list

 #

 # Convert a unicode string to a Hex list

@@ -426,7 +439,7 @@ class UniFileClassObject(object):
                 if EndPos != -1 and EndPos - StartPos == 6 :

                     if g4HexChar.match(Line[StartPos + 2 : EndPos], re.UNICODE):

                         EndStr = Line[EndPos: ]

-                        UniStr = Line[StartPos + 2: EndPos]

+                        UniStr = ('\u' + (Line[StartPos + 2 : EndPos])).decode('unicode_escape')

                         if EndStr.startswith(u'\\x') and len(EndStr) >= 7:

                             if EndStr[6] == u'\\' and g4HexChar.match(EndStr[2 : 6], re.UNICODE):

                                 Line = Line[0 : StartPos] + UniStr + EndStr