From f9eb2e0260ba98475860e4daef7d12814fd40b5e Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 11 Oct 2010 12:24:39 +0200 Subject: [PATCH] [FIX] addons: fixed cross-platform compatibility for get_module_resource() bzr revid: odo@openerp.com-20101011102439-qgrsxquxdmasnty8 --- bin/addons/__init__.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py index 8e75a7d..72e9fb2 100644 --- a/bin/addons/__init__.py +++ b/bin/addons/__init__.py @@ -273,13 +273,12 @@ def get_module_resource(module, *args): res = a and opj(a, *args) or False if zipfile.is_zipfile( a +'.zip') : zip = zipfile.ZipFile( a + ".zip") - files = [opj(a,'/'.join(f.split('/')[1:])) for f in zip.namelist()] + files = ['/'.join(f.split('/')[1:]) for f in zip.namelist()] + res = '/'.join(args) if res in files: - return res - else: - if os.path.isfile(res): - return res - + return opj(a, res) + elif os.path.isfile(res): + return res return False -- 1.7.10.4