[FIX] naming in get_resource_path, raise errors when invoked stupidly rather than just return False

bzr revid: xmo@openerp.com-20101021095817-fm0qr3fzsamj4giw
This commit is contained in:
Xavier Morel 2010-10-21 11:58:17 +02:00
parent 02d7109955
commit fcdebe5924
1 changed files with 8 additions and 7 deletions

View File

@ -270,16 +270,17 @@ def get_module_resource(module, *args):
@return: absolute path to the resource
"""
a = get_module_path(module)
res = a and opj(a, *args) or False
if not a: raise ValueError('Could not find path for module %s'%module)
resource_path = opj(a, *args)
if zipfile.is_zipfile( a +'.zip') :
zip = zipfile.ZipFile( a + ".zip")
files = ['/'.join(f.split('/')[1:]) for f in zip.namelist()]
res = '/'.join(args)
if res in files:
return opj(a, res)
elif os.path.exists(res):
return res
return False
resource_path = '/'.join(args)
if resource_path in files:
return opj(a, resource_path)
elif os.path.exists(resource_path):
return resource_path
raise IOError('Could not find resource %s'%resource_path)