diff -r 27adb952813b Lib/aifc.py --- a/Lib/aifc.py Sun Nov 13 04:11:37 2011 +0100 +++ b/Lib/aifc.py Sun Nov 13 11:03:54 2011 +0400 @@ -539,8 +539,7 @@ self._aifc = 1 # AIFF-C is default def __del__(self): - if self._file: - self.close() + self.close() # # User visible methods. @@ -643,7 +642,7 @@ raise Error('marker ID must be > 0') if pos < 0: raise Error('marker position must be >= 0') - if not isinstance(name, str): + if not isinstance(name, bytes): raise Error('marker name must be a string') for i in range(len(self._markers)): if id == self._markers[i][0]: @@ -681,19 +680,21 @@ self._patchheader() def close(self): - self._ensure_header_written(0) - if self._datawritten & 1: - # quick pad to even size - self._file.write(b'\x00') - self._datawritten = self._datawritten + 1 - self._writemarkers() - if self._nframeswritten != self._nframes or \ - self._datalength != self._datawritten or \ - self._marklength: - self._patchheader() - # Prevent ref cycles - self._convert = None - self._file.close() + if self._file: + self._ensure_header_written(0) + if self._datawritten & 1: + # quick pad to even size + self._file.write(b'\x00') + self._datawritten = self._datawritten + 1 + self._writemarkers() + if self._nframeswritten != self._nframes or \ + self._datalength != self._datawritten or \ + self._marklength: + self._patchheader() + # Prevent ref cycles + self._convert = None + self._file.close() + self._file = None # # Internal methods. diff -r 27adb952813b Lib/test/test_aifc.py --- a/Lib/test/test_aifc.py Sun Nov 13 04:11:37 2011 +0100 +++ b/Lib/test/test_aifc.py Sun Nov 13 11:03:54 2011 +0400 @@ -1,6 +1,9 @@ from test.support import findfile, run_unittest, TESTFN import unittest import os +import io +import gc +import struct import aifc @@ -109,6 +112,125 @@ f.close() self.assertEqual(testfile.closed, True) + def test_wrong_open_mode(self): + self.assertRaises(aifc.Error, aifc.open, TESTFN, 'wrong_mode') + + def test_read_wrong_form(self): + b1 = io.BytesIO(b'WRNG' + struct.pack('>L', 0)) + b2 = io.BytesIO(b'FORM' + struct.pack('>L', 4) + b'WRNG') + self.assertRaises(aifc.Error, aifc.open, b1) + self.assertRaises(aifc.Error, aifc.open, b2) + + def test_read_no_comm_chunk(self): + b = io.BytesIO(b'FORM' + struct.pack('>L', 4) + b'AIFF') + self.assertRaises(aifc.Error, aifc.open, b) + + def test_read_wrong_ulong(self): + b = io.BytesIO(b'FORM' + struct.pack('>L', 4) + b'AIFF' + + b'FVER' + struct.pack('>LB', 1, 0)) + self.assertRaises(EOFError, aifc.open, b) + + def test_read_wrong_short(self): + b = io.BytesIO(b'FORM' + struct.pack('>L', 4) + b'AIFF' + + b'COMM' + struct.pack('>LB', 1, 0)) + self.assertRaises(EOFError, aifc.open, b) + + def test_read_wrong_long(self): + b = io.BytesIO(b'FORM' + struct.pack('>L', 4) + b'AIFF' + + b'COMM' + struct.pack('>LhB', 3, 0, 0)) + self.assertRaises(EOFError, aifc.open, b) + + def test_read_wrong_compression_type(self): + b = b'FORM' + struct.pack('>L', 4) + b'AIFC' + b += b'COMM' + struct.pack('>LhlhhLL', 23, 0, 0, 0, 0, 0, 0) + b += b'WRNG' + struct.pack('B', 0) + self.assertRaises(aifc.Error, aifc.open, io.BytesIO(b)) + + def test_write_params_raises(self): + fout = self.fout = aifc.open(io.BytesIO(), 'wb') + wrong_params = (0, 0, 0, 0, b'WRNG', '') + self.assertRaises(aifc.Error, fout.setparams, wrong_params) + self.assertRaises(aifc.Error, fout.getparams) + self.assertRaises(aifc.Error, fout.setnchannels, 0) + self.assertRaises(aifc.Error, fout.getnchannels) + self.assertRaises(aifc.Error, fout.setsampwidth, 0) + self.assertRaises(aifc.Error, fout.getsampwidth) + self.assertRaises(aifc.Error, fout.setframerate, 0) + self.assertRaises(aifc.Error, fout.getframerate) + self.assertRaises(aifc.Error, fout.setcomptype, b'WRNG', '') + fout.aiff() + fout.setnchannels(1) + fout.setsampwidth(1) + fout.setframerate(1) + fout.setnframes(1) + fout.writeframes(b'1') + self.assertRaises(aifc.Error, fout.setparams, (1, 1, 1, 1, 1, 1)) + self.assertRaises(aifc.Error, fout.setnchannels, 1) + self.assertRaises(aifc.Error, fout.setsampwidth, 1) + self.assertRaises(aifc.Error, fout.setframerate, 1) + self.assertRaises(aifc.Error, fout.setnframes, 1) + self.assertRaises(aifc.Error, fout.setcomptype, b'NONE', '') + self.assertRaises(aifc.Error, fout.aiff) + self.assertRaises(aifc.Error, fout.aifc) + + def test_write_params_singles(self): + fout = self.fout = aifc.open(io.BytesIO(), 'wb') + fout.aifc() + fout.setnchannels(1) + fout.setsampwidth(2) + fout.setframerate(3) + fout.setnframes(4) + fout.setcomptype(b'NONE', b'name') + self.assertEqual(fout.getnchannels(), 1) + self.assertEqual(fout.getsampwidth(), 2) + self.assertEqual(fout.getframerate(), 3) + self.assertEqual(fout.getnframes(), 0) + self.assertEqual(fout.tell(), 0) + self.assertEqual(fout.getcomptype(), b'NONE') + self.assertEqual(fout.getcompname(), b'name') + fout.writeframes(b'1' * 4 * fout.getsampwidth() * fout.getnchannels()) + self.assertEquals(fout.getnframes(), 4) + self.assertEquals(fout.tell(), 4) + + def test_write_params_bunch(self): + fout = self.fout = aifc.open(io.BytesIO(), 'wb') + fout.aifc() + p = (1, 2, 3, 4, b'NONE', b'name') + fout.setparams(p) + self.assertEqual(fout.getparams(), p) + fout.initfp(None) + + def test_write_markers_raises(self): + fout = self.fout = aifc.open(io.BytesIO(), 'wb') + self.assertRaises(aifc.Error, fout.setmark, 0, 0, b'') + self.assertRaises(aifc.Error, fout.setmark, 1, -1, b'') + self.assertRaises(aifc.Error, fout.setmark, 1, 0, None) + self.assertRaises(aifc.Error, fout.getmark, 1) + fout.initfp(None) + + def test_write_markers_values(self): + fout = self.fout = aifc.open(io.BytesIO(), 'wb') + self.assertEqual(fout.getmarkers(), None) + fout.setmark(1, 0, b'foo1') + fout.setmark(1, 1, b'foo2') + self.assertEqual(fout.getmark(1), (1, 1, b'foo2')) + self.assertEqual(fout.getmarkers(), [(1, 1, b'foo2')]) + fout.initfp(None) + + def test_read_markers(self): + fout = self.fout = aifc.open(TESTFN, 'wb') + fout.aiff() + fout.setparams((1, 1, 1, 1, b'NONE', b'')) + fout.setmark(1, 0, b'odd') + fout.setmark(2, 0, b'even') + fout.writeframes(b'1') + fout.close() + f = self.f = aifc.open(TESTFN, 'rb') + self.assertEqual(f.getmarkers(), [(1, 0, b'odd'), (2, 0, b'even')]) + self.assertEqual(f.getmark(1), (1, 0, b'odd')) + self.assertEqual(f.getmark(2), (2, 0, b'even')) + self.assertRaises(aifc.Error, f.getmark, 3) + def test_main(): run_unittest(AIFCTest) diff -r 27adb952813b Misc/ACKS --- a/Misc/ACKS Sun Nov 13 04:11:37 2011 +0100 +++ b/Misc/ACKS Sun Nov 13 11:03:54 2011 +0400 @@ -1081,3 +1081,4 @@ Kai Zhu Tarek Ziadé Peter Åstrand +Oleg Plakhotnyuk