[Python-checkins] r72100 - in python/trunk: Lib/aifc.py Lib/test/Sine-1000Hz-300ms.aif Lib/test/test_aifc.py Lib/test/test_sundry.py Misc/ACKS Misc/NEWS

Wed Apr 29 15:17:38 CEST 2009

Author: r.david.murray
Date: Wed Apr 29 15:17:37 2009
New Revision: 72100
Log:
Fix issue 2245. aifc now skips any chunk type it doesn't actually
process instead of throwing errors for anything not in an explicit
skip list. This is per this spec: http://www.cnpbagwell.com/aiff-c.txt.
Spec reference and test sound file provided by Santiago PeresÃ³n, fix
based on patch by Hiroaki Kawai.
Added:
 python/trunk/Lib/test/Sine-1000Hz-300ms.aif (contents, props changed)
 python/trunk/Lib/test/test_aifc.py
Modified:
 python/trunk/Lib/aifc.py
 python/trunk/Lib/test/test_sundry.py
 python/trunk/Misc/ACKS
 python/trunk/Misc/NEWS
Modified: python/trunk/Lib/aifc.py
==============================================================================

--- python/trunk/Lib/aifc.py	(original)
+++ python/trunk/Lib/aifc.py	Wed Apr 29 15:17:37 2009
@@ -144,9 +144,6 @@
 
 _AIFC_version = 0xA2805140L # Version 1 of AIFF-C
 
-_skiplist = 'COMT', 'INST', 'MIDI', 'AESD', \
- 'APPL', 'NAME', 'AUTH', '(c) ', 'ANNO'
-
 def _read_long(file):
 try:
 return struct.unpack('>l', file.read(4))[0]
@@ -314,10 +311,6 @@
 self._version = _read_ulong(chunk)
 elif chunkname == 'MARK':
 self._readmark(chunk)
- elif chunkname in _skiplist:
- pass
- else:
- raise Error, 'unrecognized chunk type '+chunk.chunkname
 chunk.skip()
 if not self._comm_chunk_read or not self._ssnd_chunk:
 raise Error, 'COMM chunk and/or SSND chunk missing'
Added: python/trunk/Lib/test/Sine-1000Hz-300ms.aif
==============================================================================
Binary file. No diff available.
Added: python/trunk/Lib/test/test_aifc.py
==============================================================================
--- (empty file)
+++ python/trunk/Lib/test/test_aifc.py	Wed Apr 29 15:17:37 2009
@@ -0,0 +1,24 @@
+from test.test_support import findfile, run_unittest
+import unittest
+
+import aifc
+
+
+class AIFCTest(unittest.TestCase):
+
+ def setUp(self):
+ self.sndfilepath = findfile('Sine-1000Hz-300ms.aif')
+
+ def test_skipunknown(self):
+ #Issue 2245
+ #This file contains chunk types aifc doesn't recognize.
+ f = aifc.open(self.sndfilepath)
+ f.close()
+
+
+def test_main():
+ run_unittest(AIFCTest)
+
+
+if __name__ == "__main__":
+ unittest.main()
Modified: python/trunk/Lib/test/test_sundry.py
==============================================================================
--- python/trunk/Lib/test/test_sundry.py	(original)
+++ python/trunk/Lib/test/test_sundry.py	Wed Apr 29 15:17:37 2009
@@ -11,7 +11,6 @@
 with warnings.catch_warnings():
 warnings.simplefilter("ignore")
 import CGIHTTPServer
- import aifc
 import audiodev
 import bdb
 import cgitb
Modified: python/trunk/Misc/ACKS
==============================================================================
--- python/trunk/Misc/ACKS	(original)
+++ python/trunk/Misc/ACKS	Wed Apr 29 15:17:37 2009
@@ -370,6 +370,7 @@
 Peter van Kampen
 Jacob Kaplan-Moss
 Lou Kates
+Hiroaki Kawai
 Sebastien Keim
 Robert Kern
 Randall Kern
@@ -541,6 +542,7 @@
 Samuele Pedroni
 Marcel van der Peijl
 Steven Pemberton
+Santiago Peresón
 Mark Perrego
 Trevor Perrin
 Tim Peters
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Wed Apr 29 15:17:37 2009
@@ -255,6 +255,8 @@
 Library
 -------
 
+- Issue #2245: aifc now skips chunk types it doesn't recognize, per spec.
+
 - Issue #5874: distutils.tests.test_config_cmd is not locale-sensitive 
 anymore.
 
