archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup: rename zip (not to conflict with zip func)

Browse Source
This commit is contained in:
Campbell Barton
2014-11-06 12:48:09 +01:00
parent 0ce5b61d12
commit 5c9849f64f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/blendfile_pack.py
View File

@@ -212,10 +212,10 @@ def pack(blendfile_src, blendfile_dst, mode='FILE',
elif mode == 'ZIP': elif mode == 'ZIP':
import zipfile import zipfile
with zipfile.ZipFile(blendfile_dst.decode('utf-8'), 'w', zipfile.ZIP_DEFLATED) as zip: with zipfile.ZipFile(blendfile_dst.decode('utf-8'), 'w', zipfile.ZIP_DEFLATED) as zip_handle:
for fn in path_temp_files: for fn in path_temp_files:
yield report(" %s: %r -> <archive>\n" % (colorize("copying", color='blue'), fn)) yield report(" %s: %r -> <archive>\n" % (colorize("copying", color='blue'), fn))
zip.write(fn.decode('utf-8'), zip_handle.write(fn.decode('utf-8'),
arcname=os.path.relpath(fn[:-1], base_dir_dst).decode('utf-8')) arcname=os.path.relpath(fn[:-1], base_dir_dst).decode('utf-8'))
os.remove(fn) os.remove(fn)
@@ -228,14 +228,14 @@ def pack(blendfile_src, blendfile_dst, mode='FILE',
yield report(" %s: %r\n" % (colorize("source missing", color='red'), src)) yield report(" %s: %r\n" % (colorize("source missing", color='red'), src))
else: else:
yield report(" %s: %r -> <archive>\n" % (colorize("copying", color='blue'), src)) yield report(" %s: %r -> <archive>\n" % (colorize("copying", color='blue'), src))
zip.write(src.decode('utf-8'), zip_handle.write(src.decode('utf-8'),
arcname=os.path.relpath(dst, base_dir_dst).decode('utf-8')) arcname=os.path.relpath(dst, base_dir_dst).decode('utf-8'))
if WRITE_JSON_REMAP: if WRITE_JSON_REMAP:
import json import json
def write_dict_as_json(fn, dct): def write_dict_as_json(fn, dct):
zip.writestr( zip_handle.writestr(
fn, fn,
json.dumps(dct, json.dumps(dct,
check_circular=False, check_circular=False,