From: Radek Czajka Date: Fri, 18 Jun 2010 15:15:07 +0000 (+0200) Subject: import fix X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/59e248d7a8f7994fdb456653c4a2898994457bd9?ds=sidebyside;hp=-c import fix --- 59e248d7a8f7994fdb456653c4a2898994457bd9 diff --git a/apps/catalogue/management/commands/importbooks.py b/apps/catalogue/management/commands/importbooks.py index cead75fa2..ee469ba9b 100644 --- a/apps/catalogue/management/commands/importbooks.py +++ b/apps/catalogue/management/commands/importbooks.py @@ -44,7 +44,7 @@ class Command(BaseCommand): if not os.path.isdir(dir_name): print self.style.ERROR("%s: Not a directory. Skipping." % dir_name) else: - for file_name in os.listdir(dir_name): + for file_name in sorted(os.listdir(dir_name)): file_path = os.path.join(dir_name, file_name) file_base, ext = os.path.splitext(file_path) diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 90ecb1a3c..37ea4e842 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -296,7 +296,7 @@ class Book(models.Model): book_info = dcparser.parse(xml_file) if not isinstance(xml_file, File): - xml_file = File(xml_file) + xml_file = File(open(xml_file)) try: return cls.from_text_and_meta(xml_file, book_info, overwrite)