\r
\r
def TheTestSuite():\r
- suites = map(lambda module: module.TheTestSuite(), modules)\r
+ suites = list(map(lambda module: module.TheTestSuite(), modules))\r
return unittest.TestSuite(suites)\r
\r
if __name__ == '__main__':\r
# This test makes sure that BaseTools rejects these characters\r
# if seen in a .uni file.\r
#\r
- data = codecs.BOM_UTF16_LE + '//\x01\xd8 '\r
+ data = codecs.BOM_UTF16_LE + b'//\x01\xd8 '\r
\r
self.CheckFile(encoding=None, shouldPass=False, string=data)\r
\r
# This test makes sure that BaseTools rejects these characters\r
# if seen in a .uni file.\r
#\r
- data = '\xed\xa0\x81'\r
+ data = b'\xed\xa0\x81'\r
\r
self.CheckFile(encoding=None, shouldPass=False, string=data)\r
\r
# Same test as testSurrogatePairUnicodeCharInUtf8File, but add\r
# the UTF-8 BOM\r
#\r
- data = codecs.BOM_UTF8 + '\xed\xa0\x81'\r
+ data = codecs.BOM_UTF8 + b'\xed\xa0\x81'\r
\r
self.CheckFile(encoding=None, shouldPass=False, string=data)\r
\r
\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
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
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