mirror of
https://github.com/python/cpython.git
synced 2025-08-26 03:34:43 +00:00
Issue #18901: The sunau getparams method now returns a namedtuple rather than
a plain tuple. Patch by Claudiu Popa.
This commit is contained in:
parent
4c6a020a2d
commit
e06a89655a
5 changed files with 47 additions and 9 deletions
19
Lib/sunau.py
19
Lib/sunau.py
|
@ -51,7 +51,7 @@ This returns an instance of a class with the following public methods:
|
|||
getcomptype() -- returns compression type ('NONE' or 'ULAW')
|
||||
getcompname() -- returns human-readable version of
|
||||
compression type ('not compressed' matches 'NONE')
|
||||
getparams() -- returns a tuple consisting of all of the
|
||||
getparams() -- returns a namedtuple consisting of all of the
|
||||
above in the above order
|
||||
getmarkers() -- returns None (for compatibility with the
|
||||
aifc module)
|
||||
|
@ -103,6 +103,11 @@ The close() method is called automatically when the class instance
|
|||
is destroyed.
|
||||
"""
|
||||
|
||||
from collections import namedtuple
|
||||
|
||||
_sunau_params = namedtuple('_sunau_params',
|
||||
'nchannels sampwidth framerate nframes comptype compname')
|
||||
|
||||
# from <multimedia/audio_filehdr.h>
|
||||
AUDIO_FILE_MAGIC = 0x2e736e64
|
||||
AUDIO_FILE_ENCODING_MULAW_8 = 1
|
||||
|
@ -242,9 +247,9 @@ class Au_read:
|
|||
return 'not compressed'
|
||||
|
||||
def getparams(self):
|
||||
return self.getnchannels(), self.getsampwidth(), \
|
||||
self.getframerate(), self.getnframes(), \
|
||||
self.getcomptype(), self.getcompname()
|
||||
return _sunau_params(self.getnchannels(), self.getsampwidth(),
|
||||
self.getframerate(), self.getnframes(),
|
||||
self.getcomptype(), self.getcompname())
|
||||
|
||||
def getmarkers(self):
|
||||
return None
|
||||
|
@ -381,9 +386,9 @@ class Au_write:
|
|||
self.setcomptype(comptype, compname)
|
||||
|
||||
def getparams(self):
|
||||
return self.getnchannels(), self.getsampwidth(), \
|
||||
self.getframerate(), self.getnframes(), \
|
||||
self.getcomptype(), self.getcompname()
|
||||
return _sunau_getparams(self.getnchannels(), self.getsampwidth(),
|
||||
self.getframerate(), self.getnframes(),
|
||||
self.getcomptype(), self.getcompname())
|
||||
|
||||
def tell(self):
|
||||
return self._nframeswritten
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue