Merged revisions 85970 via svnmerge from
svn+ssh://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.
........
diff --git a/Lib/wave.py b/Lib/wave.py
index 2fa9b6b..24839ca 100644
--- a/Lib/wave.py
+++ b/Lib/wave.py
@@ -319,6 +319,7 @@
self._nframeswritten = 0
self._datawritten = 0
self._datalength = 0
+ self._headerwritten = False
def __del__(self):
self.close()
@@ -449,7 +450,7 @@
#
def _ensure_header_written(self, datasize):
- if not self._datawritten:
+ if not self._headerwritten:
if not self._nchannels:
raise Error('# channels not specified')
if not self._sampwidth:
@@ -459,6 +460,7 @@
self._write_header(datasize)
def _write_header(self, initlength):
+ assert not self._headerwritten
self._file.write(b'RIFF')
if not self._nframes:
self._nframes = initlength // (self._nchannels * self._sampwidth)
@@ -472,8 +474,10 @@
self._sampwidth * 8, 'data'))
self._data_length_pos = self._file.tell()
self._file.write(struct.pack('<l', self._datalength))
+ self._headerwritten = True
def _patchheader(self):
+ assert self._headerwritten
if self._datawritten == self._datalength:
return
curpos = self._file.tell()
diff --git a/Misc/NEWS b/Misc/NEWS
index fc9f5a6..b51e6e6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,9 @@
Library
-------
+- Issue #10198: fix duplicate header written to wave files when writeframes()
+ is called without data.
+
Build
-----