BaseTools: update Test scripts support python3

[mirror_edk2.git] / BaseTools / Tests / TestTools.py

diff --git a/BaseTools/Tests/TestTools.py b/BaseTools/Tests/TestTools.py
index e16e993048e469ea58481e40955375deb40ba298..4332dcdaac5ec51d33cfad9a2cb1b6d7ec302e5c 100644 (file)
--- a/BaseTools/Tests/TestTools.py
+++ b/BaseTools/Tests/TestTools.py
@@ -40,7 +40,7 @@ if PythonSourceDir not in sys.path:
 \r
 def MakeTheTestSuite(localItems):\r
     tests = []\r
-    for name, item in localItems.iteritems():\r
+    for name, item in localItems.items():\r
         if isinstance(item, type):\r
             if issubclass(item, unittest.TestCase):\r
                 tests.append(unittest.TestLoader().loadTestsFromTestCase(item))\r
@@ -146,9 +146,12 @@ class BaseToolsTest(unittest.TestCase):
         return data\r
 \r
     def WriteTmpFile(self, fileName, data):\r
-        f = open(self.GetTmpFilePath(fileName), 'w')\r
-        f.write(data)\r
-        f.close()\r
+        if isinstance(data, bytes):\r
+            with open(self.GetTmpFilePath(fileName), 'wb') as f:\r
+                f.write(data)\r
+        else:\r
+            with open(self.GetTmpFilePath(fileName), 'w') as f:\r
+                f.write(data)\r
 \r
     def GenRandomFileData(self, fileName, minlen = None, maxlen = None):\r
         if maxlen is None: maxlen = minlen\r
@@ -161,7 +164,7 @@ class BaseToolsTest(unittest.TestCase):
         if maxlen is None: maxlen = minlen\r
         return ''.join(\r
             [chr(random.randint(0, 255))\r
-             for x in xrange(random.randint(minlen, maxlen))\r
+             for x in range(random.randint(minlen, maxlen))\r
             ])\r
 \r
     def setUp(self):\r