\r
def MakeTheTestSuite(localItems):\r
tests = []\r
- for name, item in localItems.items():\r
+ for name, item in localItems.iteritems():\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
- 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
+ f = open(self.GetTmpFilePath(fileName), 'w')\r
+ f.write(data)\r
+ f.close()\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 range(random.randint(minlen, maxlen))\r
+ for x in xrange(random.randint(minlen, maxlen))\r
])\r
\r
def setUp(self):\r
\r
os.environ['PATH'] = self.savedEnvPath\r
sys.path = self.savedSysPath\r
+\r