1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make test_wave.py pass.

Browse Source 
I have no illusion that this fixes all issues with this module.
This commit is contained in:
Guido van Rossum 2007-07-23 21:28:30 +00:00
parent f761e104f6
commit 51a883bf87
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_wave.py
View File

@ -16,7 +16,7 @@ f.setnchannels(nchannels)
f.setsampwidth(sampwidth) f.setsampwidth(sampwidth)
f.setframerate(framerate) f.setframerate(framerate)
f.setnframes(nframes) f.setnframes(nframes)
output = '\0' * nframes * nchannels * sampwidth output = b'\0' * nframes * nchannels * sampwidth
f.writeframes(output) f.writeframes(output)
f.close() f.close()

10
Lib/wave.py
View File

@ -126,9 +126,9 @@ class Wave_read:
self._convert = None self._convert = None
self._soundpos = 0 self._soundpos = 0
self._file = Chunk(file, bigendian = 0) self._file = Chunk(file, bigendian = 0)
if self._file.getname() != 'RIFF': if self._file.getname() != b'RIFF':
raise Error, 'file does not start with RIFF id' raise Error, 'file does not start with RIFF id'
if self._file.read(4) != 'WAVE': if self._file.read(4) != b'WAVE':
raise Error, 'not a WAVE file' raise Error, 'not a WAVE file'
self._fmt_chunk_read = 0 self._fmt_chunk_read = 0
self._data_chunk = None self._data_chunk = None
@ -139,10 +139,10 @@ class Wave_read:
except EOFError: except EOFError:
break break
chunkname = chunk.getname() chunkname = chunk.getname()
if chunkname == 'fmt ': if chunkname == b'fmt ':
self._read_fmt_chunk(chunk) self._read_fmt_chunk(chunk)
self._fmt_chunk_read = 1 self._fmt_chunk_read = 1
elif chunkname == 'data': elif chunkname == b'data':
if not self._fmt_chunk_read: if not self._fmt_chunk_read:
raise Error, 'data chunk before fmt chunk' raise Error, 'data chunk before fmt chunk'
self._data_chunk = chunk self._data_chunk = chunk
@ -230,7 +230,7 @@ class Wave_read:
self._data_chunk.seek(pos, 0) self._data_chunk.seek(pos, 0)
self._data_seek_needed = 0 self._data_seek_needed = 0
if nframes == 0: if nframes == 0:
return '' return b''
if self._sampwidth > 1 and big_endian: if self._sampwidth > 1 and big_endian:
# unfortunately the fromfile() method does not take # unfortunately the fromfile() method does not take
# something that only looks like a file object, so # something that only looks like a file object, so