[IMP] parse_config is called in openerp-server.py, the direct cycle in convert.py is removed

bzr revid: vmt@openerp.com-20110126151717-tf0q2mx2inj21jls

bin/netsvc.py

@@ -39,6 +39,7 @@ import heapq
 
 # TODO modules that import netsvc only for things from loglevels must be changed to use loglevels.
 from loglevels import *
+import tools
 
 class Service(object):
     """ Base class for *Local* services
@@ -211,7 +212,6 @@ def init_logger():
     logger.addHandler(handler)
     logger.setLevel(int(tools.config['log_level'] or '0'))
 
-import tools
 init_logger()
 
 class Agent(object):

bin/openerp-server.py

@@ -62,6 +62,7 @@ logger = logging.getLogger('server')
 # import the tools module so that the commandline parameters are parsed
 #-----------------------------------------------------------------------
 import tools
+tools.config.parse_config()
 logger.info("OpenERP version - %s", release.version)
 for name, value in [('addons_path', tools.config['addons_path']),
                     ('database hostname', tools.config['db_host'] or 'localhost'),

bin/tools/__init__.py

@@ -21,7 +21,7 @@
 
 import copy
 import win32
-from config import *
+from config import config
 from misc import *
 from convert import *
 from translate import *

bin/tools/config.py

@@ -496,8 +496,3 @@ class configmanager(object):
 
 config = configmanager()
 
-# FIXME:following line should be called explicitly by the server
-# when it starts, to allow doing 'import tools.config' from
-# other python executables without parsing *their* args.
-config.parse_config()
-

bin/tools/convert.py

@@ -42,7 +42,6 @@ from datetime import datetime, timedelta
 from lxml import etree
 import misc
 import loglevels
-import osv
 import pooler
 from config import config
 from tools.translate import _
@@ -826,6 +825,7 @@ form: module.record_id""" % (xml_id,)
             else:
                 f_val = _eval_xml(self,field, self.pool, cr, self.uid, self.idref)
                 if model._columns.has_key(f_name):
+                    import osv
                     if isinstance(model._columns[f_name], osv.fields.integer):
                         f_val = int(f_val)
             res[f_name] = f_val