From 80de80c7dd0bccf2963faef39b29b668b28f039f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 9 Dec 2011 12:53:16 +0100
Subject: [PATCH] [IMP] reduce noise in setting default values of module
 descriptor file

bzr revid: xmo@openerp.com-20111209115316-2gqwmn2pi34vzu29
---
 openerp/modules/module.py | 46 ++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 78f1f831920..4b9771636c7 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -231,9 +231,32 @@ def load_information_from_description_file(module):
     if terp_file:
         info = {}
         if os.path.isfile(terp_file) or zipfile.is_zipfile(mod_path+'.zip'):
+            # default values for descriptor
+            info = {
+                'active': False,
+                'application': False,
+                'author': '',
+                'category': 'Uncategorized',
+                'certificate': None,
+                'complexity': 'normal',
+                'depends': [],
+                'description': '',
+                'icon': None,
+                'installable': True,
+                'license': 'AGPL-3',
+                'name': False,
+                'post_load': None,
+                'version': '0.0.0',
+                'web': False,
+                'website': '',
+            }
+            info.update(itertools.izip(
+                'depends data demo test init_xml update_xml demo_xml'.split(),
+                iter(list, None)))
+
             terp_f = tools.file_open(terp_file)
             try:
-                info = eval(terp_f.read())
+                info.update(eval(terp_f.read()))
             except Exception:
                 logger.notifyChannel('modules', netsvc.LOG_ERROR,
                     'module %s: exception while evaluating file %s' %
@@ -241,27 +264,6 @@ def load_information_from_description_file(module):
                 raise
             finally:
                 terp_f.close()
-            # TODO the version should probably be mandatory
-            info.setdefault('version', '0')
-            info.setdefault('category', 'Uncategorized')
-            info.setdefault('depends', [])
-            info.setdefault('author', '')
-            info.setdefault('website', '')
-            info.setdefault('name', False)
-            info.setdefault('description', '')
-            info.setdefault('complexity', 'normal')
-            info.setdefault('application', False)
-            info.setdefault('icon', 'images/icon.png')
-            info['certificate'] = info.get('certificate') or None
-            info['web'] = info.get('web') or False
-            info['license'] = info.get('license') or 'AGPL-3'
-            info.setdefault('installable', True)
-            info.setdefault('active', False)
-            # If the following is provided, it is called after the module is --loaded.
-            info.setdefault('post_load', None)
-            for kind in ['data', 'demo', 'test',
-                'init_xml', 'update_xml', 'demo_xml']:
-                info.setdefault(kind, [])
             return info
 
     #TODO: refactor the logger in this file to follow the logging guidelines