evin/secretary
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplify template loading and render() now returns rendere document instead of an instance of StringIO.

Browse source
This commit is contained in:
Christopher Ramírez 2013-07-22 13:27:42 -06:00
parent 46ec22b187
commit d1226e852c
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
__init__.py
View file

@ -136,12 +136,8 @@ class Render():
CRUD operations into the ZIP archive. CRUD operations into the ZIP archive.
""" """
if os.path.exists(self.template): self._unpacked_template = zipfile.ZipFile(self.template, 'r')
f = open(self.template, 'r')
self._unpacked_template = zipfile.ZipFile(f, "r" )
else:
self._unpacked_template = zipfile.ZipFile(self._template, "r" )
# go through the files in source # go through the files in source
for zi in self._unpacked_template.filelist: for zi in self._unpacked_template.filelist:
file_contents = self._unpacked_template.read( zi.filename ) file_contents = self._unpacked_template.read( zi.filename )
@ -218,7 +214,7 @@ class Render():
self.headers = None self.headers = None
self.pack_document() self.pack_document()
return self.rendered return self.rendered.getvalue()
def node_parents(self, node, parent_type): def node_parents(self, node, parent_type):
@ -316,6 +312,6 @@ if __name__ == "__main__":
result = render.render(countries=countries, document=document) result = render.render(countries=countries, document=document)
output = open('rendered.odt', 'w') output = open('rendered.odt', 'w')
output.write(result.getvalue()) output.write(result)
print "Template rendering finished! Check rendered.odt file." print "Template rendering finished! Check rendered.odt file."