BaseTools: Remove types.TypeType

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

diff --git a/BaseTools/Tests/TestTools.py b/BaseTools/Tests/TestTools.py
index ac009db1fa66414e67f6dec18b84698e3c4cff9f..20a4ea28aa11b0622429cd222b932d94e92b146c 100644 (file)
--- a/BaseTools/Tests/TestTools.py
+++ b/BaseTools/Tests/TestTools.py
@@ -1,7 +1,8 @@
+from __future__ import print_function\r
 ## @file\r
 # Utility functions and classes for BaseTools unit tests\r
 #\r
-#  Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2008 - 2015, 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
@@ -22,7 +23,6 @@ import random
 import shutil\r
 import subprocess\r
 import sys\r
-import types\r
 import unittest\r
 \r
 TestsDir = os.path.realpath(os.path.split(sys.argv[0])[0])\r
@@ -31,10 +31,17 @@ CSourceDir = os.path.join(BaseToolsDir, 'Source', 'C')
 PythonSourceDir = os.path.join(BaseToolsDir, 'Source', 'Python')\r
 TestTempDir = os.path.join(TestsDir, 'TestTempDir')\r
 \r
+if PythonSourceDir not in sys.path:\r
+    #\r
+    # Allow unit tests to import BaseTools python modules. This is very useful\r
+    # for writing unit tests.\r
+    #\r
+    sys.path.append(PythonSourceDir)\r
+\r
 def MakeTheTestSuite(localItems):\r
     tests = []\r
     for name, item in localItems.iteritems():\r
-        if isinstance(item, types.TypeType):\r
+        if isinstance(item, type):\r
             if issubclass(item, unittest.TestCase):\r
                 tests.append(unittest.TestLoader().loadTestsFromTestCase(item))\r
             elif issubclass(item, unittest.TestSuite):\r
@@ -84,9 +91,9 @@ class BaseToolsTest(unittest.TestCase):
             os.remove(path)\r
 \r
     def DisplayBinaryData(self, description, data):\r
-        print description, '(base64 encoded):'\r
+        print(description, '(base64 encoded):')\r
         b64data = base64.b64encode(data)\r
-        print b64data\r
+        print(b64data)\r
 \r
     def DisplayFile(self, fileName):\r
         sys.stdout.write(self.ReadTmpFile(fileName))\r