From ee3e6600fb937e92174f7d0e819e5dd283949f4f Mon Sep 17 00:00:00 2001 From: ced <> Date: Tue, 16 Oct 2007 06:27:40 +0000 Subject: [PATCH] Fix read file from a zip module that points to real outside file. bzr revid: ced-95329ecbf74237e1399443471809240fafa811c2 --- bin/tools/misc.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/tools/misc.py b/bin/tools/misc.py index 4121406f322..c503b15b2ac 100644 --- a/bin/tools/misc.py +++ b/bin/tools/misc.py @@ -192,9 +192,12 @@ def file_open(name, mode="r", subdir='addons'): if zipfile.is_zipfile(head+'.zip'): import StringIO zfile = zipfile.ZipFile(head+'.zip') - return StringIO.StringIO(zfile.read(os.path.join( - os.path.basename(head), zipname).replace( - os.sep, '/'))) + try: + return StringIO.StringIO(zfile.read(os.path.join( + os.path.basename(head), zipname).replace( + os.sep, '/'))) + except: + pass if os.path.isfile(name): return file(name, mode)