Issue #18919: If the close() method of a writer in the sunau or wave module

failed, second invocation of close() and destructor no more raise an
exception.

Lib/sunau.py

@@ -414,6 +414,8 @@ class Au_write:
             self._patchheader()
 
     def close(self):
+        if self._file:
+            try:
                 self._ensure_header_written()
                 if self._nframeswritten != self._nframes or \
                         self._datalength != self._datawritten:
@@ -421,6 +423,7 @@ class Au_write:
                 self._file.flush()
                 if self._opened and self._file:
                     self._file.close()
+            finally:
                 self._file = None
 
     #

Lib/wave.py

@@ -436,10 +436,12 @@ class Wave_write:
 
     def close(self):
         if self._file:
+            try:
                 self._ensure_header_written(0)
                 if self._datalength != self._datawritten:
                     self._patchheader()
                 self._file.flush()
+            finally:
                 self._file = None
         if self._i_opened_the_file:
             self._i_opened_the_file.close()

Misc/NEWS

@@ -76,6 +76,10 @@ Core and Builtins
 Library
 -------
 
+- Issue #18919: If the close() method of a writer in the sunau or wave module
+  failed, second invocation of close() and destructor no more raise an
+  exception.
+
 - Issue #19131: The aifc module now correctly reads and writes sampwidth of
   compressed streams.