BaseTools: Replace BSD License with BSD+Patent License

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

diff --git a/BaseTools/Tests/TestTools.py b/BaseTools/Tests/TestTools.py
index e16e993048e469ea58481e40955375deb40ba298..1099fd4eeaea074fc8a6f620874cfdcf60afcd27 100644 (file)
--- a/BaseTools/Tests/TestTools.py
+++ b/BaseTools/Tests/TestTools.py
@@ -4,13 +4,7 @@ from __future__ import print_function
 #\r
 #  Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
 ##\r
@@ -24,6 +18,7 @@ import shutil
 import subprocess\r
 import sys\r
 import unittest\r
+import codecs\r
 \r
 TestsDir = os.path.realpath(os.path.split(sys.argv[0])[0])\r
 BaseToolsDir = os.path.realpath(os.path.join(TestsDir, '..'))\r
@@ -40,7 +35,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 +141,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 codecs.open(self.GetTmpFilePath(fileName), 'w', encoding='utf-8') 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 +159,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