mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

* calendar.py: minor cleanups

Browse source 
* ftplib.py: support __init__ with optional host, port args
* aifc.py: ensure header is written on close even when no data is written
This commit is contained in:
Guido van Rossum 1993-06-17 12:38:10 +00:00
parent 234f942aef
commit 52fc1f607e
3 changed files with 49 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Lib/aifc.py
View file

@ -619,6 +619,7 @@ class Aifc_write:
self._nframes = 0
self._nframeswritten = 0
self._datawritten = 0
self._datalength = 0
self._markers = []
self._marklength = 0
self._aifc = 1 # AIFF-C is default
@ -743,19 +744,7 @@ class Aifc_write:
return self._markers
def writeframesraw(self, data):
if not self._nframeswritten:
if self._comptype in ('ULAW', 'ALAW'):
if not self._sampwidth:
self._sampwidth = AL.SAMPLE_16
if self._sampwidth != AL.SAMPLE_16:
raise Error, 'sample width must be 2 when compressing with ULAW or ALAW'
if not self._nchannels:
raise Error, '# channels not specified'
if not self._sampwidth:
raise Error, 'sample width not specified'
if not self._framerate:
raise Error, 'sampling rate not specified'
self._write_header(len(data))
self._ensure_header_written(len(data))
nframes = len(data) / (self._sampwidth * self._nchannels)
if self._comp:
dummy = self._comp.SetParam(CL.FRAME_BUFFER_SIZE, \
@ -774,6 +763,7 @@ class Aifc_write:
self._patchheader()
def close(self):
self._ensure_header_written(0)
if self._datawritten & 1:
# quick pad to even size
self._file.write(chr(0))
@ -792,6 +782,21 @@ class Aifc_write:
#
# Internal methods.
#
def _ensure_header_written(self, datasize):
if not self._nframeswritten:
if self._comptype in ('ULAW', 'ALAW'):
if not self._sampwidth:
self._sampwidth = AL.SAMPLE_16
if self._sampwidth != AL.SAMPLE_16:
raise Error, 'sample width must be 2 when compressing with ULAW or ALAW'
if not self._nchannels:
raise Error, '# channels not specified'
if not self._sampwidth:
raise Error, 'sample width not specified'
if not self._framerate:
raise Error, 'sampling rate not specified'
self._write_header(datasize)
def _write_header(self, initlength):
if self._aifc and self._comptype != 'NONE':
try: