diff options
Diffstat (limited to 'backend/zmusic/picard/metadata.py')
| -rw-r--r-- | backend/zmusic/picard/metadata.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/backend/zmusic/picard/metadata.py b/backend/zmusic/picard/metadata.py index 5074edf..4d556a2 100644 --- a/backend/zmusic/picard/metadata.py +++ b/backend/zmusic/picard/metadata.py @@ -70,7 +70,7 @@ class Metadata(object): values = self._items.get(name, None) if values: if len(values) > 1: - return MULTI_VALUED_JOINER.join(values) + return MULTI_VALUED_JOINER.join(map(str, values)) else: return values[0] else: @@ -109,8 +109,8 @@ class Metadata(object): def keys(self): return self._items.keys() - def iteritems(self): - for name, values in self._items.iteritems(): + def items(self): + for name, values in self._items.items(): for value in values: yield name, value @@ -120,7 +120,7 @@ class Metadata(object): >>> m.items() [("key1", "value1"), ("key1", "value2"), ("key2", "value3")] """ - return list(self.iteritems()) + return list(self.items()) def rawitems(self): """Returns the metadata items. |