Commit 795a4e29 authored by Jérome Perrin's avatar Jérome Perrin Committed by Kazuhiko Shiozaki

fixup! WIP: py2/py3: BusinessTemplate.py.

parent 0463dea6
...@@ -347,9 +347,11 @@ class BusinessTemplateArchive(object): ...@@ -347,9 +347,11 @@ class BusinessTemplateArchive(object):
try: try:
write = self._writeFile write = self._writeFile
except AttributeError: except AttributeError:
if not isinstance(obj, str): if not isinstance(obj, (bytes, str)):
obj.seek(0) obj.seek(0)
obj = obj.read() obj = obj.read()
elif not isinstance(obj, bytes):
obj = obj.encode('utf-8')
self.revision.hash(path, obj) self.revision.hash(path, obj)
self._writeString(obj, path) self._writeString(obj, path)
else: else:
...@@ -377,11 +379,8 @@ class BusinessTemplateFolder(BusinessTemplateArchive): ...@@ -377,11 +379,8 @@ class BusinessTemplateFolder(BusinessTemplateArchive):
object_path = os.path.join(self.path, path) object_path = os.path.join(self.path, path)
path = os.path.dirname(object_path) path = os.path.dirname(object_path)
os.path.exists(path) or os.makedirs(path) os.path.exists(path) or os.makedirs(path)
f = open(object_path, 'wb') with open(object_path, 'wb') as f:
try:
f.write(obj) f.write(obj)
finally:
f.close()
def importFiles(self, item): def importFiles(self, item):
""" """
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment