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.
........

diff --git a/Lib/wave.py b/Lib/wave.py
index 718e1eb1c7142ac26f38e03abd6d283bc2387a08..2016a2a69703cf5ba099a5f6dabdbf87a7238d72 100644 (file)
--- a/Lib/wave.py
+++ b/Lib/wave.py
@@ -319,6 +319,7 @@ class Wave_write:
         self._nframeswritten = 0
         self._datawritten = 0
         self._datalength = 0
+        self._headerwritten = False
 
     def __del__(self):
         self.close()
@@ -449,7 +450,7 @@ class Wave_write:
     #
 
     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 @@ class Wave_write:
             self._write_header(datasize)
 
     def _write_header(self, initlength):
+        assert not self._headerwritten
         self._file.write('RIFF')
         if not self._nframes:
             self._nframes = initlength / (self._nchannels * self._sampwidth)
@@ -472,8 +474,10 @@ class Wave_write:
             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 da50fa27979cd80912bb4e987d0add17c9ce6e95..dd572e50e815b6624b6096542e4580abcee8ca13 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,6 +91,9 @@ Library
 - Issue #4471: Properly shutdown socket in IMAP.shutdown().  Patch by
   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
   --enable-shared.