diff options
Diffstat (limited to 'Lib/wave.py')
| -rw-r--r-- | Lib/wave.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Lib/wave.py b/Lib/wave.py index 24839ca4ce..54f030267a 100644 --- a/Lib/wave.py +++ b/Lib/wave.py @@ -248,7 +248,7 @@ class Wave_read: chunk = chunk.file chunk.size_read = chunk.size_read + nitems * self._sampwidth data.byteswap() - data = data.tostring() + data = data.tobytes() else: data = self._data_chunk.read(nframes * self._framesize) if self._convert and data: @@ -261,9 +261,9 @@ class Wave_read: # def _read_fmt_chunk(self, chunk): - wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack_from('<hhllh', chunk.read(14)) + wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack_from('<HHLLH', chunk.read(14)) if wFormatTag == WAVE_FORMAT_PCM: - sampwidth = struct.unpack_from('<h', chunk.read(2))[0] + sampwidth = struct.unpack_from('<H', chunk.read(2))[0] self._sampwidth = (sampwidth + 7) // 8 else: raise Error('unknown format: %r' % (wFormatTag,)) @@ -356,7 +356,7 @@ class Wave_write: raise Error('cannot change parameters after starting to write') if framerate <= 0: raise Error('bad frame rate') - self._framerate = framerate + self._framerate = int(round(framerate)) def getframerate(self): if not self._framerate: @@ -466,14 +466,14 @@ class Wave_write: self._nframes = initlength // (self._nchannels * self._sampwidth) self._datalength = self._nframes * self._nchannels * self._sampwidth self._form_length_pos = self._file.tell() - self._file.write(struct.pack('<l4s4slhhllhh4s', - 36 + self._datalength, 'WAVE', 'fmt ', 16, + self._file.write(struct.pack('<L4s4sLHHLLHH4s', + 36 + self._datalength, b'WAVE', b'fmt ', 16, WAVE_FORMAT_PCM, self._nchannels, self._framerate, self._nchannels * self._framerate * self._sampwidth, self._nchannels * self._sampwidth, - self._sampwidth * 8, 'data')) + self._sampwidth * 8, b'data')) self._data_length_pos = self._file.tell() - self._file.write(struct.pack('<l', self._datalength)) + self._file.write(struct.pack('<L', self._datalength)) self._headerwritten = True def _patchheader(self): @@ -482,9 +482,9 @@ class Wave_write: return curpos = self._file.tell() self._file.seek(self._form_length_pos, 0) - self._file.write(struct.pack('<l', 36 + self._datawritten)) + self._file.write(struct.pack('<L', 36 + self._datawritten)) self._file.seek(self._data_length_pos, 0) - self._file.write(struct.pack('<l', self._datawritten)) + self._file.write(struct.pack('<L', self._datawritten)) self._file.seek(curpos, 0) self._datalength = self._datawritten |