From d1226e852c08162faa11c7e2c353d985b7e0ae7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christopher=20Ram=C3=ADrez?= Date: Mon, 22 Jul 2013 13:27:42 -0600 Subject: [PATCH] Simplify template loading and render() now returns rendere document instead of an instance of StringIO. --- __init__.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/__init__.py b/__init__.py index aad0f6e..0ba64c8 100644 --- a/__init__.py +++ b/__init__.py @@ -136,12 +136,8 @@ class Render(): CRUD operations into the ZIP archive. """ - if os.path.exists(self.template): - f = open(self.template, 'r') - self._unpacked_template = zipfile.ZipFile(f, "r" ) - else: - self._unpacked_template = zipfile.ZipFile(self._template, "r" ) - + self._unpacked_template = zipfile.ZipFile(self.template, 'r') + # go through the files in source for zi in self._unpacked_template.filelist: file_contents = self._unpacked_template.read( zi.filename ) @@ -218,7 +214,7 @@ class Render(): self.headers = None self.pack_document() - return self.rendered + return self.rendered.getvalue() def node_parents(self, node, parent_type): @@ -316,6 +312,6 @@ if __name__ == "__main__": result = render.render(countries=countries, document=document) output = open('rendered.odt', 'w') - output.write(result.getvalue()) + output.write(result) print "Template rendering finished! Check rendered.odt file." \ No newline at end of file