Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-12 02:12:10 +01:00
Code Issues Projects Releases Wiki Activity

fix an error where a unicode literal was used as a keyword arg name (#206)

Browse source
This commit is contained in:
Adrian Sampson 2011-06-12 15:43:50 -07:00
parent 973fca1d89
commit a7b7cb69c0
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -34,6 +34,7 @@
* Fix a rare deadlock when finishing the import pipeline.
* Fix an issue that was causing mpdupdate to run twice for every album.
* Fix a bug that caused release dates/years not to be fetched.
* Fix a crasher when setting MBIDs on MP3s file metadata.
* A better error message is given when the database file is unopenable.
1.0b8

7
beets/mediafile.py
View file

@ -140,7 +140,7 @@ class StorageStyle(object):
"""
def __init__(self, key, list_elem = True, as_type = unicode,
packing = None, pack_pos = 0, id3_desc = None,
id3_frame_field = u'text'):
id3_frame_field = 'text'):
self.key = key
self.list_elem = list_elem
self.as_type = as_type
@ -322,6 +322,7 @@ class MediaField(object):
# need to make a new frame?
if not found:
assert isinstance(style.id3_frame_field, str) # Keyword.
frame = mutagen.id3.Frames[style.key](
encoding=3,
desc=style.id3_desc,
@ -340,12 +341,14 @@ class MediaField(object):
setattr(frame, style.id3_frame_field, val)
else:
# New frame.
assert isinstance(style.id3_frame_field, str) # Keyword.
frame = mutagen.id3.UFID(owner=owner,
**{style.id3_frame_field: val})
obj.mgfile.tags.setall('UFID', [frame])
# Just replace based on key.
else:
assert isinstance(style.id3_frame_field, str) # Keyword.
frame = mutagen.id3.Frames[style.key](encoding = 3,
**{style.id3_frame_field: val})
obj.mgfile.tags.setall(style.key, [frame])
@ -805,7 +808,7 @@ class MediaFile(object):
mb_trackid = MediaField(
mp3 = StorageStyle('UFID:http://musicbrainz.org',
list_elem = False,
id3_frame_field = u'data'),
id3_frame_field = 'data'),
mp4 = StorageStyle(
'----:com.apple.iTunes:MusicBrainz Track Id',
as_type=str),