summaryrefslogtreecommitdiffstats
path: root/Lib/aifc.py
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-01-01 17:04:37 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-01-01 17:04:37 (GMT)
commitbdd5354700d2ebafc98375ef2982fbcbb42b1ba5 (patch)
treebfd1c9d12e631ab57ad72657c955bbe227a365f1 /Lib/aifc.py
parentda785fd527f5627cfd8f563fa4ac2c53fd8bfada (diff)
downloadcpython-bdd5354700d2ebafc98375ef2982fbcbb42b1ba5.zip
cpython-bdd5354700d2ebafc98375ef2982fbcbb42b1ba5.tar.gz
cpython-bdd5354700d2ebafc98375ef2982fbcbb42b1ba5.tar.bz2
Issue #13680: add lowecase compression type to write header; patch by Oleg Plakhotnyuk
Diffstat (limited to 'Lib/aifc.py')
-rw-r--r--Lib/aifc.py12
1 files changed, 2 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':