From 8c31299e1e491cf8a3c8f3ef57ea84233dca32dd Mon Sep 17 00:00:00 2001 From: Will Toohey Date: Thu, 31 May 2018 15:22:49 +1000 Subject: [PATCH] Bugfixes and hassle free install --- ifstools/handlers/GenericFile.py | 2 +- ifstools/handlers/TexFolder.py | 4 ++-- ifstools/ifstools.py | 1 + requirements.txt | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ifstools/handlers/GenericFile.py b/ifstools/handlers/GenericFile.py index 7a1cff7..e6a58ac 100644 --- a/ifstools/handlers/GenericFile.py +++ b/ifstools/handlers/GenericFile.py @@ -52,7 +52,7 @@ class GenericFile(Node): tqdm_progress.update(1) elem = etree.SubElement(manifest, self.packed_name) elem.attrib['__type'] = '3s32' - data = self.load(convert_kbin = False) + data = self.load(convert_kbin = False, **kwargs) if self.name.endswith('.xml') and not KBinXML.is_binary_xml(data): data = KBinXML(data).to_binary() # offset, size, timestamp diff --git a/ifstools/handlers/TexFolder.py b/ifstools/handlers/TexFolder.py index 4ab4ff8..d139080 100644 --- a/ifstools/handlers/TexFolder.py +++ b/ifstools/handlers/TexFolder.py @@ -8,8 +8,8 @@ from . import MD5Folder, ImageFile, GenericFile from .ImageDecoders import cachable_formats class TextureList(GenericFile): - def _load_from_filesystem(self): - raw = GenericFile._load_from_filesystem(self) + def _load_from_filesystem(self, **kwargs): + raw = GenericFile._load_from_filesystem(self, **kwargs) k = KBinXML(raw) # fallback to a type we can encode for tex in k.xml_doc.iterchildren(): diff --git a/ifstools/ifstools.py b/ifstools/ifstools.py index 2cc99de..52ff82e 100644 --- a/ifstools/ifstools.py +++ b/ifstools/ifstools.py @@ -1,6 +1,7 @@ import argparse import os import multiprocessing # for pyinstaller fixes +from sys import exit # exe freeze try: # py 2 input = raw_input diff --git a/requirements.txt b/requirements.txt index bd8862b..e57c90a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ lxml tqdm pillow future -kbinxml>=1.2 +kbinxml>=1.5