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, 8 insertions, 7 deletions

diff --git a/BaseTools/Source/Python/GenFds/FfsFileStatement.py b/BaseTools/Source/Python/GenFds/FfsFileStatement.py
index 3daf75b205..4c35aac76a 100644
--- a/BaseTools/Source/Python/GenFds/FfsFileStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsFileStatement.py
@@ -15,6 +15,7 @@
 ##

 # Import Modules

 #

+from __future__ import absolute_import

 from . import Ffs

 from . import Rule

 import Common.LongFilePathOs as os

@@ -82,7 +83,7 @@ class FileStatement (FileStatementClassObject) :
         Dict.update(self.DefineVarDict)

         SectionAlignments = None

         if self.FvName is not None :

-            Buffer = BytesIO()

+            Buffer = BytesIO('')

             if self.FvName.upper() not in GenFdsGlobalVariable.FdfParser.Profile.FvDict:

                 EdkLogger.error("GenFds", GENFDS_ERROR, "FV (%s) is NOT described in FDF file!" % (self.FvName))

             Fv = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(self.FvName.upper())

@@ -99,7 +100,7 @@ class FileStatement (FileStatementClassObject) :
         elif self.FileName is not None:

             if hasattr(self, 'FvFileType') and self.FvFileType == 'RAW':

                 if isinstance(self.FileName, list) and isinstance(self.SubAlignment, list) and len(self.FileName) == len(self.SubAlignment):

-                    FileContent = BytesIO()

+                    FileContent = ''

                     MaxAlignIndex = 0

                     MaxAlignValue = 1

                     for Index, File in enumerate(self.FileName):

@@ -115,15 +116,15 @@ class FileStatement (FileStatementClassObject) :
                         if AlignValue > MaxAlignValue:

                             MaxAlignIndex = Index

                             MaxAlignValue = AlignValue

-                        FileContent.write(Content)

-                        if len(FileContent.getvalue()) % AlignValue != 0:

+                        FileContent += Content

+                        if len(FileContent) % AlignValue != 0:

                             Size = AlignValue - len(FileContent) % AlignValue

                             for i in range(0, Size):

-                                FileContent.write(pack('B', 0xFF))

+                                FileContent += pack('B', 0xFF)

 

-                    if FileContent.getvalue() != b'':

+                    if FileContent:

                         OutputRAWFile = os.path.join(GenFdsGlobalVariable.FfsDir, self.NameGuid, self.NameGuid + '.raw')

-                        SaveFileOnChange(OutputRAWFile, FileContent.getvalue(), True)

+                        SaveFileOnChange(OutputRAWFile, FileContent, True)

                         self.FileName = OutputRAWFile

                         self.SubAlignment = self.SubAlignment[MaxAlignIndex]