From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 3 Dec 2015 09:00:30 +0000 (+0100)
Subject: fix tags
X-Git-Tag: 1.6b~7^2~45
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5612ed7d3f4d958c0fbbbf1caf41aedfbbc5e353;p=telemeta.git

fix tags
---

diff --git a/telemeta/models/collection.py b/telemeta/models/collection.py
index 58d9ecdf..334d2793 100644
--- a/telemeta/models/collection.py
+++ b/telemeta/models/collection.py
@@ -272,11 +272,10 @@ class MediaCollection(MediaResource):
         import json
         return json.dumps(self.to_dict_with_more())
 
-
-    def to_row(self):
+    def to_row(self, tags):
         row = []
         _dict = self.to_dict_with_more()
-        for tag in _dict:
+        for tag in tags:
             if tag in _dict.keys():
                 row.append(_dict[tag])
             else:
diff --git a/telemeta/models/item.py b/telemeta/models/item.py
index 53c5669a..da1c3e0b 100644
--- a/telemeta/models/item.py
+++ b/telemeta/models/item.py
@@ -311,7 +311,6 @@ class MediaItem(MediaResource):
                                                     'grapher_id': 'waveform_centroid',
                                                     'width': 346,
                                                     'height': 130}))
-
         # One ID only
         identifiers = self.identifiers.all()
         if identifiers:
@@ -339,10 +338,10 @@ class MediaItem(MediaResource):
 
         return metadata
 
-    def to_row(self):
+    def to_row(self, tags):
         row = []
         _dict = self.to_dict_with_more()
-        for tag in _dict:
+        for tag in tags:
             if tag in _dict.keys():
                 row.append(_dict[tag])
             else:
diff --git a/telemeta/util/unicode.py b/telemeta/util/unicode.py
index b5bf267a..73af8abc 100644
--- a/telemeta/util/unicode.py
+++ b/telemeta/util/unicode.py
@@ -82,7 +82,7 @@ class UnicodeCSVWriter(object):
     def output(self):
         yield self.writer.writerow(self.tags)
         for element in self.elements:
-            yield self.writer.writerow(_stringify_list(element.to_row(), self.encoding))
+            yield self.writer.writerow(_stringify_list(element.to_row(self.tags), self.encoding))
 
 
 class Echo(object):