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

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

5 files changed, 4 insertions, 8 deletions

diff --git a/bin/netsvc.py b/bin/netsvc.py
index f79aab382b9..696d225c4af 100644
--- a/bin/netsvc.py
+++ b/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):
diff --git a/bin/openerp-server.py b/bin/openerp-server.py
index a3f8ed84b34..20849f6e3c0 100755
--- a/bin/openerp-server.py
+++ b/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'),
diff --git a/bin/tools/__init__.py b/bin/tools/__init__.py
index f1a0faf0f8f..16042841b6e 100644
--- a/bin/tools/__init__.py
+++ b/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 *
diff --git a/bin/tools/config.py b/bin/tools/config.py
index b7ebd1d26a6..76522bfcd76 100644
--- a/bin/tools/config.py
+++ b/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()
-
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index dcfc2d815b5..538c79eff3d 100644
--- a/bin/tools/convert.py
+++ b/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