[IMP] Use always the openerp namespace.

bzr revid: vmt@openerp.com-20130209072837-uv2przyses3b1a57

openerp/addons/base/res/test/res_lang.py

@@ -1,12 +1,6 @@
 import sys
 import openerp
 
-# TODO this loop will be exposed as open_openerp_namespace()
-# once trunk-cleaning-vmt is merged.
-for k, v in list(sys.modules.items()):
-        if k.startswith('openerp.') and sys.modules.get(k[8:]) is None:
-            sys.modules[k[8:]] = v
-
 import openerp.addons.base.res.res_lang as res_lang
 res_lang._group_examples()
 

openerp/addons/base/test/base_test.yml

@@ -5,7 +5,7 @@
     1. Try a few common expressions to verify they work with safe_eval
 -
     !python {model: ir.model}: |
-        from tools.safe_eval import safe_eval
+        from openerp.tools.safe_eval import safe_eval
         expected = (1, {"a": 9 * 2}, (True, False, None))
         actual = safe_eval('(1, {"a": 9 * 2}, (True, False, None))')
         assert actual == expected, "Simple python expressions are not working with safe_eval"
@@ -41,8 +41,8 @@
     5. Try forbidden expressions in safe_eval to verify they are not allowed (open)
 -
     !python {model: ir.model}: |
-        from tools.safe_eval import safe_eval
-        from tools.misc import mute_logger
+        from openerp.tools.safe_eval import safe_eval
+        from openerp.tools.misc import mute_logger
         try:
             with mute_logger('openerp.tools.safe_eval'):
                 safe_eval('open("/etc/passwd","r")')
@@ -146,7 +146,7 @@
     "Float precision tests: verify that float rounding methods are working correctly via res.currency"
 -
     !python {model: res.currency}: |
-        from tools import float_repr
+        from openerp.tools import float_repr
         from math import log10
         currency = self.browse(cr, uid, ref('base.EUR'))
         def try_round(amount, expected, self=self, cr=cr, currency=currency, float_repr=float_repr,
@@ -197,7 +197,7 @@
     "Float precision tests: verify that float rounding methods are working correctly via tools"
 -
     !python {model: res.currency}: |
-        from tools import float_compare, float_is_zero, float_round, float_repr
+        from openerp.tools import float_compare, float_is_zero, float_round, float_repr
         def try_round(amount, expected, precision_digits=3, float_round=float_round, float_repr=float_repr):
             result = float_repr(float_round(amount, precision_digits=precision_digits),
                                 precision_digits=precision_digits)
@@ -271,7 +271,7 @@
     !python {model: res.currency}: |
         currency = self.browse(cr, uid, ref('base.EUR'))
         res_currency_rate = self.pool.get('res.currency.rate')
-        from tools import float_compare, float_is_zero, float_round, float_repr
+        from openerp.tools import float_compare, float_is_zero, float_round, float_repr
         def try_roundtrip(value, expected, self=self, cr=cr, currency=currency,
                           res_currency_rate=res_currency_rate):
             rate_id = res_currency_rate.create(cr, 1, {'name':'2000-01-01',
@@ -289,7 +289,7 @@
     "Float precision tests: verify that invalid parameters are forbidden"
 -
     !python {model: res.currency}: |
-        from tools import float_compare, float_is_zero, float_round
+        from openerp.tools import float_compare, float_is_zero, float_round
         try:
             float_is_zero(0.01, precision_digits=3, precision_rounding=0.01)
         except AssertionError:

openerp/addons/base/test/test_auth.yml

@@ -12,7 +12,7 @@
   I will prepare the context
 -
   !python {model: res.users }: |
-    from tools import config
+    from openerp.tools import config
     host = config.get_misc('httpd', 'interface')
     port = config.get_misc('httpd', 'port', 8069)
     if not host:
@@ -70,4 +70,4 @@
         raise AssertionError("User should not be enabled!")
     except Fault, e:
         if e.faultCode != 'AccessDenied':
-            raise
+            raise

openerp/conf/deprecation.py

@@ -32,6 +32,7 @@ by the user to check if her code is future proof.
 # without the 'openerp.' prefix. E.g. openerp.osv.osv and osv.osv refer to the
 # same module.
 # Introduced around 2011.02.
-open_openerp_namespace = True
+# Change to False around 2013.02.
+open_openerp_namespace = False
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

openerp/modules/loading.py

@@ -45,13 +45,6 @@ from openerp.modules.module import initialize_sys_path, \
 
 _logger = logging.getLogger(__name__)
 
-def open_openerp_namespace():
-    # See comment for open_openerp_namespace.
-    if openerp.conf.deprecation.open_openerp_namespace:
-        for k, v in list(sys.modules.items()):
-            if k.startswith('openerp.') and sys.modules.get(k[8:]) is None:
-                sys.modules[k[8:]] = v
-
 
 def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=None, report=None):
     """Migrates+Updates or Installs all module nodes from ``graph``
@@ -268,8 +261,6 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
     # It should be a method exposed by the pool.
     initialize_sys_path()
 
-    open_openerp_namespace()
-
     force = []
     if force_demo:
         force.append('demo')

openerp/service/__init__.py

@@ -73,7 +73,6 @@ def start_internal():
     if start_internal_done:
         return
     openerp.netsvc.init_logger()
-    openerp.modules.loading.open_openerp_namespace()
 
     # Instantiate local services (this is a legacy design).
     openerp.osv.osv.start_object_proxy()

openerp/tools/config.py

@@ -487,7 +487,6 @@ class configmanager(object):
             openerp.conf.server_wide_modules = ['web','web_kanban']
         if complete:
             openerp.modules.module.initialize_sys_path()
-            openerp.modules.loading.open_openerp_namespace()
 
     def _generate_pgpassfile(self):
         """

openerpcommand/initialize.py

@@ -17,8 +17,6 @@ def install_openerp(database_name, create_database_flag, module_names, install_d
 
     # Install the import hook, to import openerp.addons.<module>.
     openerp.modules.module.initialize_sys_path()
-    if hasattr(openerp.modules.loading, 'open_openerp_namespace'):
-        openerp.modules.loading.open_openerp_namespace()
 
     registry = openerp.modules.registry.RegistryManager.get(
         database_name, update_module=True, force_demo=install_demo_data)

openerpcommand/run_tests.py

@@ -120,7 +120,6 @@ def run(args):
 
     # Install the import hook, to import openerp.addons.<module>.
     openerp.modules.module.initialize_sys_path()
-    openerp.modules.loading.open_openerp_namespace()
 
     # Extract module, submodule from the command-line args.
     if args.module is None:

openerpcommand/uninstall.py

@@ -38,7 +38,6 @@ def run(args):
 
     # Install the import hook, to import openerp.addons.<module>.
     openerp.modules.module.initialize_sys_path()
-    openerp.modules.loading.open_openerp_namespace()
 
     registry = openerp.modules.registry.RegistryManager.get(
         args.database, update_module=False)