X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=bin%2Fzip.py;h=e99c9a8283ed6829e824388994eee5a043a51652;hp=eebbaeb736a04c2421c9d47b5111cab424ce7948;hb=HEAD;hpb=c5883d2a782366c0a3468a989e756cf37dabbd46 diff --git a/bin/zip.py b/bin/zip.py index eebbaeb..35bf0e6 100755 --- a/bin/zip.py +++ b/bin/zip.py @@ -1,7 +1,7 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 """Zip (zip -r9) with encoded filenames - Written by Oleg Broytman. Copyright (C) 2009, 2010 PhiloSoft Design. + Written by Oleg Broytman. Copyright (C) 2009-2023 PhiloSoft Design. """ import sys, os @@ -22,8 +22,11 @@ if len(arguments) < 2: def addToZip(zf, path): if os.path.isfile(path): - print path - recoded_path = path.decode(default_encoding).encode('cp866') + print(path) + if isinstance(path, bytes): + recoded_path = path.decode(default_encoding).encode('cp866') + else: + recoded_path = path zf.write(path, recoded_path, ZIP_DEFLATED) elif os.path.isdir(path): for nm in os.listdir(path):