From dd7aae78054f1163e1fb3efdffe427a28758a027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 20 Nov 2008 19:07:57 +0100 Subject: [PATCH] Don't return '.zip' in get_module_list --- trytond/ir/module/module.py | 2 -- trytond/modules/__init__.py | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/trytond/ir/module/module.py b/trytond/ir/module/module.py index 686743a251..6986536afb 100644 --- a/trytond/ir/module/module.py +++ b/trytond/ir/module/module.py @@ -352,8 +352,6 @@ class Module(OSV): # iterate through installed modules and mark them as being so for name in module_names: mod_name = name - if name[-4:] == '.zip': - mod_name = name[:-4] if mod_name in name2module.keys(): mod = name2module[mod_name]['en_US'] tryton = Module.get_module_info(mod_name) diff --git a/trytond/modules/__init__.py b/trytond/modules/__init__.py index 040d81e943..e3d52b56a0 100644 --- a/trytond/modules/__init__.py +++ b/trytond/modules/__init__.py @@ -127,8 +127,6 @@ def create_graph(module_list, force=None): packages = [] for module in module_list: - if module[-4:] == '.zip': - module = module[:-4] tryton_file = OPJ(MODULES_PATH, module, '__tryton__.py') mod_path = OPJ(MODULES_PATH, module) if module in ('ir', 'workflow', 'res', 'webdav'): @@ -285,7 +283,7 @@ def get_module_list(): if os.path.isdir(OPJ(MODULES_PATH, file)): module_list.append(file) elif file[-4:] == '.zip': - module_list.append(file) + module_list.append(file[-4:]) for ep in pkg_resources.iter_entry_points('trytond.modules'): mod_name = ep.module_name.split('.')[-1] module_list.append(mod_name)