From 7444c9582b48b87df15194cf2d2b51b0015b7f68 Mon Sep 17 00:00:00 2001 From: Joey Payne Date: Wed, 6 May 2015 22:26:54 -0600 Subject: [PATCH] Fixed issues with using deflating compression in zipfiles. --- command_line.py | 2 ++ main.py | 1 + utils.py | 10 +++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/command_line.py b/command_line.py index 511518c..320bc03 100644 --- a/command_line.py +++ b/command_line.py @@ -724,6 +724,8 @@ class CommandBase(object): def compress_nw(self, nw_path): compression = self.get_setting('nw_compression_level') + if compression.value == 0: + return comp_dict = {'Darwin64bit': get_file('files/compressors/upx-mac'), 'Darwin32bit': get_file('files/compressors/upx-mac'), 'Linux64bit': get_file('files/compressors/upx-linux-x64'), diff --git a/main.py b/main.py index 47a0412..52f2028 100644 --- a/main.py +++ b/main.py @@ -723,6 +723,7 @@ class MainWindow(QtGui.QMainWindow, CommandBase): icon.setPixmap(None) icon.setStyleSheet(self.icon_style) else: + icon.setPixmap(None) icon.setStyleSheet(self.icon_style) diff --git a/utils.py b/utils.py index 5ee89e1..6bbf600 100644 --- a/utils.py +++ b/utils.py @@ -3,11 +3,11 @@ import os, zipfile, io, platform import sys, tempfile import subprocess -try: - import zlib - ZIP_MODE = zipfile.ZIP_DEFLATED -except: - ZIP_MODE = zipfile.ZIP_STORED +#try: +# import zlib +# ZIP_MODE = zipfile.ZIP_DEFLATED +#except: +ZIP_MODE = zipfile.ZIP_STORED DEBUG = False