diff --git a/pyproject.toml b/pyproject.toml index 2c443fc..9fcc3c4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -69,19 +69,8 @@ ignore = [ 'UP022', # Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` 'SIM115', # Use a context manager for opening files 'UP031', #Use format specifiers instead of percent format - 'C408', # Unnecessary `dict()` call (rewrite as a literal) + # 'C408', # Unnecessary `dict()` call (rewrite as a literal) # 'C417' # Unnecessary `map()` usage (rewrite using a generator expression) ] -# [tool.pylint] -# max-line-length = 88 -# disable = [ -# "C0103", # (invalid-name) -# "C0114", # (missing-module-docstring) -# "C0115", # (missing-class-docstring) -# "C0116", # (missing-function-docstring) -# "R0903", # (too-few-public-methods) -# "R0913", # (too-many-arguments) -# "W0105", # (pointless-string-statement) -# ] diff --git a/src/wavinfo/wave_adm_reader.py b/src/wavinfo/wave_adm_reader.py index bbbaea6..7de36b4 100644 --- a/src/wavinfo/wave_adm_reader.py +++ b/src/wavinfo/wave_adm_reader.py @@ -57,7 +57,7 @@ class WavADMReader: Read the ADM `audioProgramme` data structure and some of its reference properties. """ - ret_dict = dict() + ret_dict = {} nsmap = self.axml.getroot().nsmap @@ -71,7 +71,7 @@ class WavADMReader: ret_dict["contents"] = [] for content_ref in program.findall("audioContentIDRef", namespaces=nsmap): - content_dict = dict() + content_dict = {} content_dict["content_id"] = cid = content_ref.text content = afext.find( "audioContent[@audioContentID='%s']" % cid, namespaces=nsmap @@ -80,7 +80,7 @@ class WavADMReader: content_dict["objects"] = [] for object_ref in content.findall("audioObjectIDRef", namespaces=nsmap): - object_dict = dict() + object_dict = {} object_dict["object_id"] = oid = object_ref.text object = afext.find( "audioObject[@audioObjectID='%s']" % oid, namespaces=nsmap @@ -206,7 +206,7 @@ class WavADMReader: rd.update(self.track_info(channel_uid_rec.track_index)) return rd - return dict( - channel_entries=[make_entry(z) for z in self.channel_uids], - programme=self.programme(), - ) + return { + 'channel_entries': [make_entry(z) for z in self.channel_uids], + 'programme': self.programme(), + } diff --git a/src/wavinfo/wave_cues_reader.py b/src/wavinfo/wave_cues_reader.py index fbe51b5..317f8b5 100644 --- a/src/wavinfo/wave_cues_reader.py +++ b/src/wavinfo/wave_cues_reader.py @@ -176,13 +176,15 @@ class RangeLabel(NamedTuple): parsed = unpack(leader_struct_fmt, data[0 : calcsize(leader_struct_fmt)]) text_data = data[calcsize(leader_struct_fmt) :] + purpose_str = parsed[2].decode('ascii') + if data[6] != 0: fallback_encoding = f"cp{data[6]}" return cls( name=parsed[0], length=parsed[1], - purpose=parsed[2], + purpose=purpose_str, country=parsed[3], language=parsed[4], dialect=parsed[5], @@ -282,10 +284,10 @@ class WavCuesReader: return next((r.length for r in self.ranges if r.name == cue_ident), None) def to_dict(self) -> Dict[str, Any]: - retval = dict() + retval = {} for n, t in self.each_cue(): - retval[n] = dict() + retval[n] = {} retval[n]["frame"] = t label, note = self.label_and_note(n) r = self.range(n) diff --git a/src/wavinfo/wave_dbmd_reader.py b/src/wavinfo/wave_dbmd_reader.py index 7baac88..f9ff8d5 100644 --- a/src/wavinfo/wave_dbmd_reader.py +++ b/src/wavinfo/wave_dbmd_reader.py @@ -687,4 +687,4 @@ class WavDolbyMetadataReader: atmos = [asdict(x) for x in self.dolby_atmos()] # atmos_sup = map(lambda x: asdict(x), self.dolby_atmos_supplemental()) - return dict(dolby_digital_plus=list(ddp), dolby_atmos=list(atmos)) + return {'dolby_digital_plus': ddp, 'dolby_atmos': atmos}