merge with 3.2

2 files changed, 13 insertions, 10 deletions

diff --git a/Lib/aifc.py b/Lib/aifc.py
index 015d398..4646285 100644
--- a/Lib/aifc.py
+++ b/Lib/aifc.py
@@ -716,18 +716,12 @@ class Aifc_write:
 
     def _ensure_header_written(self, datasize):
         if not self._nframeswritten:
-            if self._comptype in (b'ULAW', b'ALAW'):
+            if self._comptype in (b'ULAW', b'ulaw', b'ALAW', b'alaw', b'G722'):
                 if not self._sampwidth:
                     self._sampwidth = 2
                 if self._sampwidth != 2:
                     raise Error('sample width must be 2 when compressing '
-                                'with ulaw/ULAW or alaw/ALAW')
-            if self._comptype == b'G722':
-                if not self._sampwidth:
-                    self._sampwidth = 2
-                if self._sampwidth != 2:
-                    raise Error('sample width must be 2 when compressing '
-                                'with G7.22 (ADPCM)')
+                                'with ulaw/ULAW, alaw/ALAW or G7.22 (ADPCM)')
             if not self._nchannels:
                 raise Error('# channels not specified')
             if not self._sampwidth:
@@ -743,8 +737,6 @@ class Aifc_write:
             self._convert = self._lin2ulaw
         elif self._comptype in (b'alaw', b'ALAW'):
             self._convert = self._lin2alaw
-        else:
-            raise Error('unsupported compression type')
 
     def _write_header(self, initlength):
         if self._aifc and self._comptype != b'NONE':
diff --git a/Lib/test/test_aifc.py b/Lib/test/test_aifc.py
index 4869bf3..af2305f 100644
--- a/Lib/test/test_aifc.py
+++ b/Lib/test/test_aifc.py
@@ -1,6 +1,7 @@
 from test.support import findfile, run_unittest, TESTFN
 import unittest
 import os
+import io
 
 import aifc
 
@@ -109,6 +110,16 @@ class AIFCTest(unittest.TestCase):
         f.close()
         self.assertEqual(testfile.closed, True)
 
+    def test_write_header_comptype_sampwidth(self):
+        for comptype in (b'ULAW', b'ulaw', b'ALAW', b'alaw', b'G722'):
+            fout = self.fout = aifc.open(io.BytesIO(), 'wb')
+            fout.setnchannels(1)
+            fout.setframerate(1)
+            fout.setcomptype(comptype, b'')
+            fout.close()
+            self.assertEqual(fout.getsampwidth(), 2)
+            fout.initfp(None)
+
 
 def test_main():
     run_unittest(AIFCTest)