diff options
Diffstat (limited to 'Lib/test/test_audioop.py')
| -rw-r--r-- | Lib/test/test_audioop.py | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py index 5b8e0f1..c14e8b8 100644 --- a/Lib/test/test_audioop.py +++ b/Lib/test/test_audioop.py @@ -1,23 +1,23 @@ import audioop import unittest -from test.test_support import run_unittest +from test.support import run_unittest -endian = 'big' if audioop.getsample('\0\1', 2, 0) == 1 else 'little' +endian = 'big' if audioop.getsample(b'\0\1', 2, 0) == 1 else 'little' def gendata1(): - return '\0\1\2' + return b'\0\1\2' def gendata2(): if endian == 'big': - return '\0\0\0\1\0\2' + return b'\0\0\0\1\0\2' else: - return '\0\0\1\0\2\0' + return b'\0\0\1\0\2\0' def gendata4(): if endian == 'big': - return '\0\0\0\0\0\0\0\1\0\0\0\2' + return b'\0\0\0\0\0\0\0\1\0\0\0\2' else: - return '\0\0\0\0\1\0\0\0\2\0\0\0' + return b'\0\0\0\0\1\0\0\0\2\0\0\0' data = [gendata1(), gendata2(), gendata4()] @@ -68,9 +68,9 @@ class TestAudioop(unittest.TestCase): def test_add(self): data2 = [] for d in data: - str = '' - for s in d: - str = str + chr(ord(s)*2) + str = bytearray(len(d)) + for i,b in enumerate(d): + str[i] = 2*b data2.append(str) self.assertEqual(audioop.add(data[0], data[0], 1), data2[0]) self.assertEqual(audioop.add(data[1], data[1], 2), data2[1]) @@ -101,12 +101,12 @@ class TestAudioop(unittest.TestCase): def test_lin2adpcm(self): # Very cursory test - self.assertEqual(audioop.lin2adpcm('\0\0\0\0', 1, None), ('\0\0', (0,0))) + self.assertEqual(audioop.lin2adpcm(b'\0\0\0\0', 1, None), (b'\0\0', (0,0))) def test_lin2alaw(self): - self.assertEqual(audioop.lin2alaw(data[0], 1), '\xd5\xc5\xf5') - self.assertEqual(audioop.lin2alaw(data[1], 2), '\xd5\xd5\xd5') - self.assertEqual(audioop.lin2alaw(data[2], 4), '\xd5\xd5\xd5') + self.assertEqual(audioop.lin2alaw(data[0], 1), b'\xd5\xc5\xf5') + self.assertEqual(audioop.lin2alaw(data[1], 2), b'\xd5\xd5\xd5') + self.assertEqual(audioop.lin2alaw(data[2], 4), b'\xd5\xd5\xd5') def test_alaw2lin(self): # Cursory @@ -124,9 +124,9 @@ class TestAudioop(unittest.TestCase): b'\x00\x00\x08\x00\x00\x00\x08\x01\x00\x00\x10\x02') def test_lin2ulaw(self): - self.assertEqual(audioop.lin2ulaw(data[0], 1), '\xff\xe7\xdb') - self.assertEqual(audioop.lin2ulaw(data[1], 2), '\xff\xff\xff') - self.assertEqual(audioop.lin2ulaw(data[2], 4), '\xff\xff\xff') + self.assertEqual(audioop.lin2ulaw(data[0], 1), b'\xff\xe7\xdb') + self.assertEqual(audioop.lin2ulaw(data[1], 2), b'\xff\xff\xff') + self.assertEqual(audioop.lin2ulaw(data[2], 4), b'\xff\xff\xff') def test_ulaw2lin(self): # Cursory @@ -146,9 +146,9 @@ class TestAudioop(unittest.TestCase): def test_mul(self): data2 = [] for d in data: - str = '' - for s in d: - str = str + chr(ord(s)*2) + str = bytearray(len(d)) + for i,b in enumerate(d): + str[i] = 2*b data2.append(str) self.assertEqual(audioop.mul(data[0], 1, 2), data2[0]) self.assertEqual(audioop.mul(data[1],2, 2), data2[1]) @@ -158,21 +158,23 @@ class TestAudioop(unittest.TestCase): state = None d1, state = audioop.ratecv(data[0], 1, 1, 8000, 16000, state) d2, state = audioop.ratecv(data[0], 1, 1, 8000, 16000, state) - self.assertEqual(d1 + d2, '\000\000\001\001\002\001\000\000\001\001\002') + self.assertEqual(d1 + d2, b'\000\000\001\001\002\001\000\000\001\001\002') def test_reverse(self): - self.assertEqual(audioop.reverse(data[0], 1), '\2\1\0') + self.assertEqual(audioop.reverse(data[0], 1), b'\2\1\0') def test_tomono(self): - data2 = '' + data2 = bytearray() for d in data[0]: - data2 = data2 + d + d + data2.append(d) + data2.append(d) self.assertEqual(audioop.tomono(data2, 1, 0.5, 0.5), data[0]) def test_tostereo(self): - data2 = '' + data2 = bytearray() for d in data[0]: - data2 = data2 + d + d + data2.append(d) + data2.append(d) self.assertEqual(audioop.tostereo(data[0], 1, 1, 1), data2) def test_findfactor(self): @@ -193,7 +195,7 @@ class TestAudioop(unittest.TestCase): def test_negativelen(self): # from issue 3306, previously it segfaulted self.assertRaises(audioop.error, - audioop.findmax, ''.join( chr(x) for x in xrange(256)), -2392392) + audioop.findmax, ''.join(chr(x) for x in range(256)), -2392392) def test_issue7673(self): state = None |