fix telemeta-backup for compatibility with django 1.0

diff --git a/telemeta/backup/core.py b/telemeta/backup/core.py
index e7838bdac5662f2090e69d29712afd9b47fb1565..153d7b77d1aa192eac5cf7d2fb0f0d10221bf783 100644 (file)
--- a/telemeta/backup/core.py
+++ b/telemeta/backup/core.py
@@ -58,7 +58,7 @@ class CollectionSerializer(object):
                 if item.file:
                     dst_basename = self.__get_media_filename(item)
                     dst = coll_dir + "/" + dst_basename
-                    shutil.copyfile(settings.MEDIA_ROOT + "/" + item.file, dst)
+                    shutil.copyfile(item.file.path, dst)
                     hash = self.__get_file_md5(dst)
                     md5_file.write(hash + "  " + dst_basename + "\n")
 

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 3c41a27d8ddfce0e3cf893b890a82b4a368462c2..2ed47d542d78ac383f9c5ae161d587b80310b3a2 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -61,7 +61,7 @@ class MediaCore(object):
         fields = self.to_dict()
         for name, value in fields.iteritems():
             element = doc.createElement(name)
-            value = unicode(str(value), "utf-8")
+            value = unicode(value)
             element.appendChild(doc.createTextNode(value))
             top.appendChild(element)
         return doc