Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 85970 via svnmerge from 

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

........
  r85970 | georg.brandl | 2010-10-30 10:29:28 +0200 (Sa, 30 Okt 2010) | 1 line

  #10198: fix duplicate header when writeframes() is called with an empty string.
........
This commit is contained in:
Georg Brandl 2010-11-20 11:29:09 +00:00
parent a7d1d2401d
commit ef805a6b17
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/wave.py
View File

@ -319,6 +319,7 @@ class Wave_write:
self._nframeswritten = 0 self._nframeswritten = 0
self._datawritten = 0 self._datawritten = 0
self._datalength = 0 self._datalength = 0
self._headerwritten = False
def __del__(self): def __del__(self):
self.close() self.close()
@ -449,7 +450,7 @@ class Wave_write:
# #
def _ensure_header_written(self, datasize): def _ensure_header_written(self, datasize):
if not self._datawritten: if not self._headerwritten:
if not self._nchannels: if not self._nchannels:
raise Error, '# channels not specified' raise Error, '# channels not specified'
if not self._sampwidth: if not self._sampwidth:
@ -459,6 +460,7 @@ class Wave_write:
self._write_header(datasize) self._write_header(datasize)
def _write_header(self, initlength): def _write_header(self, initlength):
assert not self._headerwritten
self._file.write('RIFF') self._file.write('RIFF')
if not self._nframes: if not self._nframes:
self._nframes = initlength / (self._nchannels * self._sampwidth) self._nframes = initlength / (self._nchannels * self._sampwidth)
@ -472,8 +474,10 @@ class Wave_write:
self._sampwidth * 8, 'data')) self._sampwidth * 8, 'data'))
self._data_length_pos = self._file.tell() 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): def _patchheader(self):
assert self._headerwritten
if self._datawritten == self._datalength: if self._datawritten == self._datalength:
return return
curpos = self._file.tell() curpos = self._file.tell()

3
Misc/NEWS
View File

@ -91,6 +91,9 @@ Library
- Issue #4471: Properly shutdown socket in IMAP.shutdown(). Patch by - Issue #4471: Properly shutdown socket in IMAP.shutdown(). Patch by
Lorenzo M. Catucci. Lorenzo M. Catucci.
- Issue #10198: fix duplicate header written to wave files when writeframes()
is called without data.
- Issue #10126: Fix distutils' test_build when Python was built with - Issue #10126: Fix distutils' test_build when Python was built with
--enable-shared. --enable-shared.