traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #13594: various fixes to aifc module; patch by Oleg Plakhotnyuk

This commit is contained in:
Sandro Tosi 2012-01-01 22:53:08 +01:00
parent bdd5354700
commit 70efbefcc5
2 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/aifc.py
View File

@ -539,7 +539,6 @@ class Aifc_write:
self._aifc = 1 # AIFF-C is default
def __del__(self):
if self._file:
self.close()
#
@ -643,8 +642,8 @@ class Aifc_write:
raise Error('marker ID must be > 0')
if pos < 0:
raise Error('marker position must be >= 0')
if not isinstance(name, str):
raise Error('marker name must be a string')
if not isinstance(name, bytes):
raise Error('marker name must be bytes')
for i in range(len(self._markers)):
if id == self._markers[i][0]:
self._markers[i] = id, pos, name
@ -681,6 +680,7 @@ class Aifc_write:
self._patchheader()
def close(self):
if self._file:
self._ensure_header_written(0)
if self._datawritten & 1:
# quick pad to even size
@ -694,6 +694,7 @@ class Aifc_write:
# Prevent ref cycles
self._convert = None
self._file.close()
self._file = None
#
# Internal methods.

23
Lib/test/test_aifc.py
View File

@ -120,6 +120,29 @@ class AIFCTest(unittest.TestCase):
self.assertEqual(fout.getsampwidth(), 2)
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'\x00')
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)