From cea4ae7c12e6e20272a5d8bd2e9e0cd77fbb00af Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Thu, 10 Sep 2020 19:33:15 +0200 Subject: [PATCH] Make variable names less ambiguous - item -> track - tracknumber -> number (as it was misleading, since there's a tracknumber property) --- picard/ui/infodialog.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/picard/ui/infodialog.py b/picard/ui/infodialog.py index 2e4d4984e..297612a56 100644 --- a/picard/ui/infodialog.py +++ b/picard/ui/infodialog.py @@ -297,7 +297,7 @@ def format_tracklist(cluster): info.append("%s %s" % (_('Artist:'), htmlescape(cluster.metadata["albumartist"]))) info.append("") - TrackListItem = namedtuple('TrackListItem', 'tracknumber, title, artist, length') + TrackListItem = namedtuple('TrackListItem', 'number, title, artist, length') tracklists = defaultdict(list) if isinstance(cluster, Album): objlist = cluster.tracks @@ -310,13 +310,13 @@ def format_tracklist(cluster): m["~length"]) tracklists[obj_.discnumber].append(track) - def sorttracknum(item): + def sorttracknum(track): try: - return int(item.tracknumber) + return int(track.number) except ValueError: try: # This allows to parse values like '3' but also '3/10' - m = re.search(r'^\d+', item.tracknumber) + m = re.search(r'^\d+', track.number) return int(m.group(0)) except AttributeError: return 0