From 57640805c7ef307fec1a0653fbbbaf9772861b66 Mon Sep 17 00:00:00 2001 From: olivier <> Date: Mon, 29 Sep 2008 18:04:02 +0000 Subject: [PATCH] fix telemeta-backup for compatibility with django 1.0 --- telemeta/backup/core.py | 2 +- telemeta/models/media.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/telemeta/backup/core.py b/telemeta/backup/core.py index e7838bda..153d7b77 100644 --- 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 3c41a27d..2ed47d54 100644 --- 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 -- 2.39.5