Merged revisions 82856-82857 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82856 | victor.stinner | 2010-07-14 01:04:56 +0200 (mer., 14 juil. 2010) | 2 lines

  Issue #9243: Fix sndhdr module and add unit tests, contributed by James Lee.
........
  r82857 | victor.stinner | 2010-07-14 01:08:01 +0200 (mer., 14 juil. 2010) | 2 lines

  Woops, test_sndhdr.py contains the same code twice: fix it
........
This commit is contained in:
Victor Stinner 2010-07-13 23:19:20 +00:00
parent 3f682adcf2
commit 964ee2669e
12 changed files with 19 additions and 4 deletions

View file

@ -57,12 +57,12 @@ tests = []
def test_aifc(h, f):
import aifc
if h.startswith(b'FORM'):
if not h.startswith(b'FORM'):
return None
if h[8:12] == b'AIFC':
fmt = 'aifc'
elif h[8:12] == b'AIFF':
fmt = b'aiff'
fmt = 'aiff'
else:
return None
f.seek(0)
@ -123,7 +123,7 @@ tests.append(test_hcom)
def test_voc(h, f):
if h.startswith(b'Creative Voice File\032'):
if not h.startswith(b'Creative Voice File\032'):
return None
sbseek = get_short_le(h[20:22])
rate = 0
@ -150,7 +150,7 @@ tests.append(test_wav)
def test_8svx(h, f):
if h.startswith(b'FORM') or h[8:12] != b'8SVX':
if not h.startswith(b'FORM') or h[8:12] != b'8SVX':
return None
# Should decode it to get #channels -- assume always 1
return '8svx', 0, 1, 0, 8