diff options
Diffstat (limited to 'backend/zmusic/picard/formats/id3.py')
| -rw-r--r-- | backend/zmusic/picard/formats/id3.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/backend/zmusic/picard/formats/id3.py b/backend/zmusic/picard/formats/id3.py index 8e955d5..b7185b8 100644 --- a/backend/zmusic/picard/formats/id3.py +++ b/backend/zmusic/picard/formats/id3.py @@ -25,7 +25,7 @@ from zmusic.picard.metadata import Metadata from zmusic.picard.file import File from zmusic.picard.formats.mutagenext import compatid3 from zmusic.picard.util import encode_filename, sanitize_date -from urlparse import urlparse +from urllib.parse import urlparse # Ugly, but... I need to save the text in ISO-8859-1 even if it contains @@ -104,7 +104,7 @@ class ID3File(File): 'TPUB': 'label', 'TLAN': 'language', } - __rtranslate = dict([(v, k) for k, v in __translate.iteritems()]) + __rtranslate = dict([(v, k) for k, v in __translate.items()]) __translate_freetext = { 'MusicBrainz Artist Id': 'musicbrainz_artistid', @@ -127,7 +127,7 @@ class ID3File(File): 'ASIN': 'asin', 'MusicMagic Fingerprint': 'musicip_fingerprint', } - __rtranslate_freetext = dict([(v, k) for k, v in __translate_freetext.iteritems()]) + __rtranslate_freetext = dict([(v, k) for k, v in __translate_freetext.items()]) __tipl_roles = { 'engineer': 'engineer', @@ -136,7 +136,7 @@ class ID3File(File): 'DJ-mix': 'djmixer', 'mix': 'mixer', } - __rtipl_roles = dict([(v, k) for k, v in __tipl_roles.iteritems()]) + __rtipl_roles = dict([(v, k) for k, v in __tipl_roles.items()]) __other_supported_tags = ("discnumber", "tracknumber", "totaldiscs", "totaltracks") @@ -158,13 +158,13 @@ class ID3File(File): if frameid.startswith('T'): for text in frame.text: if text: - metadata.add(name, unicode(text)) + metadata.add(name, str(text)) elif frameid == 'COMM': for text in frame.text: if text: - metadata.add('%s:%s' % (name, frame.desc), unicode(text)) + metadata.add('%s:%s' % (name, frame.desc), str(text)) else: - metadata.add(name, unicode(frame)) + metadata.add(name, str(frame)) elif frameid == "TMCL": for role, name in frame.people: if role or name: @@ -179,14 +179,14 @@ class ID3File(File): else: name = str(frame.desc.lower()) for text in frame.text: - metadata.add(name, unicode(text)) + metadata.add(name, str(text)) elif frameid == 'USLT': name = 'lyrics' if frame.desc: name += ':%s' % frame.desc - metadata.add(name, unicode(frame.text)) + metadata.add(name, str(frame.text)) elif frameid == 'UFID' and frame.owner == 'http://musicbrainz.org': - metadata['musicbrainz_trackid'] = unicode(frame.data) + metadata['musicbrainz_trackid'] = str(frame.data) elif frameid == 'TRCK': value = frame.text[0].split('/') if len(value) > 1: @@ -204,7 +204,7 @@ class ID3File(File): elif frameid == 'POPM': # Rating in ID3 ranges from 0 to 255, normalize this to the range 0 to 5 if False: - rating = unicode(int(round(frame.rating / 255.0 * (5 - 1)))) + rating = str(int(round(frame.rating / 255.0 * (5 - 1)))) metadata.add('~rating', rating) if 'date' in metadata: |