fix unicode export bugs

diff --git a/telemeta/management/commands/telemeta-export-playlist-to-csv.py b/telemeta/management/commands/telemeta-export-playlist-to-csv.py
index 95d168b2e09eae7a24e0540a75b939ad0df706e0..185df544cf57bbb1f62f4180d7cceb8a065ce295 100644 (file)
--- a/telemeta/management/commands/telemeta-export-playlist-to-csv.py
+++ b/telemeta/management/commands/telemeta-export-playlist-to-csv.py
@@ -20,7 +20,12 @@ class Command(BaseCommand):
         public_id = args[-2]
         f = open(path, 'w')
         playlist = Playlist.objects.get(public_id=public_id)
-        elements = playlist.ressources.all()
+        elements = []
+        for resource in playlist.resources.all():
+            if resource.resource_type == "item":
+                elements.append(MediaItem.objects.get(public_id=resource.resource_id))
+            elif resource.resource_type == "collection":
+                elements.append(MediaCollection.objects.get(public_id=resource.resource_id))
         writer = UnicodeWriter(f)
         csv = CSVExport(writer)
         csv.write(elements)

diff --git a/telemeta/models/core.py b/telemeta/models/core.py
index 8530310c378c04b3a2c52647617f5ce452177cb8..5e647beede5684ace00d56216f4e90e46c0ef3ad 100644 (file)
--- a/telemeta/models/core.py
+++ b/telemeta/models/core.py
@@ -184,7 +184,7 @@ class ModelCore(EnhancedModel):
         "Return model fields as a dict of name/value pairs"
         fields_dict = {}
         for field in self._meta.fields:
-            fields_dict[field.name] = unicode(getattr(self, field.name))
+            fields_dict[field.name] = getattr(self, field.name)
         return fields_dict
 
     def to_list(self):

diff --git a/telemeta/models/item.py b/telemeta/models/item.py
index 32d9422e58cd767c81cfb769f16a343fad78880f..20166cc0f3ec4bed0ab4048bed58145ef4fd6c56 100644 (file)
--- a/telemeta/models/item.py
+++ b/telemeta/models/item.py
@@ -296,7 +296,7 @@ class MediaItem(MediaResource):
         metadata['performers'] = ';'.join(performers)
 
         i = 0
-        for indentifier in self.identifiers.all():
+        for identifier in self.identifiers.all():
             metadata['identifier' + '_' + str(i)] = identifier.identifier
             metadata['identifier_type' + '_' + str(i)] = identifier.type
             metadata['identifier_date_last' + '_' + str(i)] = unicode(identifier.date_last)