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

diff --git a/BaseTools/Tests/TestTools.py b/BaseTools/Tests/TestTools.py
index 65948a7ae2..e16e993048 100644
--- a/BaseTools/Tests/TestTools.py
+++ b/BaseTools/Tests/TestTools.py
@@ -40,7 +40,7 @@ if PythonSourceDir not in sys.path:
 

 def MakeTheTestSuite(localItems):

     tests = []

-    for name, item in localItems.items():

+    for name, item in localItems.iteritems():

         if isinstance(item, type):

             if issubclass(item, unittest.TestCase):

                 tests.append(unittest.TestLoader().loadTestsFromTestCase(item))

@@ -146,12 +146,9 @@ class BaseToolsTest(unittest.TestCase):
         return data

 

     def WriteTmpFile(self, fileName, data):

-        if isinstance(data, bytes):

-            with open(self.GetTmpFilePath(fileName), 'wb') as f:

-                f.write(data)

-        else:

-            with open(self.GetTmpFilePath(fileName), 'w') as f:

-                f.write(data)

+        f = open(self.GetTmpFilePath(fileName), 'w')

+        f.write(data)

+        f.close()

 

     def GenRandomFileData(self, fileName, minlen = None, maxlen = None):

         if maxlen is None: maxlen = minlen

@@ -164,7 +161,7 @@ class BaseToolsTest(unittest.TestCase):
         if maxlen is None: maxlen = minlen

         return ''.join(

             [chr(random.randint(0, 255))

-             for x in range(random.randint(minlen, maxlen))

+             for x in xrange(random.randint(minlen, maxlen))

             ])

 

     def setUp(self):

@@ -186,3 +183,4 @@ class BaseToolsTest(unittest.TestCase):
 

         os.environ['PATH'] = self.savedEnvPath

         sys.path = self.savedSysPath

+