From: Marcin Koziej Date: Tue, 11 Oct 2011 10:51:50 +0000 (+0200) Subject: genrowanie pdf: usnięcie bloku try..catch; xml na pewno jest poprawny, ponieważ zosta... X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/120d1af7c84eba0f9b31315bfcf7c9a0dc544269?hp=ce268f7e02d3c4cfb11f700d2ae179abc151f8ae genrowanie pdf: usnięcie bloku try..catch; xml na pewno jest poprawny, ponieważ został już zparse'owany. Nie ma po co logować i powstrzymywać wyjątku wystąpił --- diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 930f98d14..0273e47c7 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -514,30 +514,23 @@ class Book(models.Model): """ (Re)builds the pdf file. """ - from librarian import pdf, ParseError + from librarian import pdf from tempfile import NamedTemporaryFile import os + path, fname = os.path.realpath(self.xml_file.path).rsplit('/', 1) try: - path, fname = os.path.realpath(self.xml_file.path).rsplit('/', 1) - try: - pdf_file = NamedTemporaryFile(delete=False) - - pdf.transform(BookImportDocProvider(self), - file_path=str(self.xml_file.path), - output_file=pdf_file, - ) - - self.pdf_file.save('%s.pdf' % self.slug, File(open(pdf_file.name))) - finally: - unlink(pdf_file.name) - - except ParseError, e: - print '%(file)s:%(name)s:%(message)s; use -v to see more output' % { - 'file': self.xml_file.path, - 'name': e.__class__.__name__, - 'message': e - } + pdf_file = NamedTemporaryFile(delete=False) + + pdf.transform(BookImportDocProvider(self), + file_path=str(self.xml_file.path), + output_file=pdf_file, + ) + + self.pdf_file.save('%s.pdf' % self.slug, File(open(pdf_file.name))) + finally: + unlink(pdf_file.name) + def build_epub(self, remove_descendants=True): """ (Re)builds the epub file.