diff --git a/openerp/addons/base/res/test/res_lang.py b/openerp/addons/base/res/test/res_lang.py index 58963043ee6..dbfa64f2993 100644 --- a/openerp/addons/base/res/test/res_lang.py +++ b/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() diff --git a/openerp/conf/deprecation.py b/openerp/conf/deprecation.py index 53be31b46f9..11399bef4fb 100644 --- a/openerp/conf/deprecation.py +++ b/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: diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index 638a40c9fa8..07e5c28a925 100644 --- a/openerp/modules/loading.py +++ b/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') diff --git a/openerp/service/__init__.py b/openerp/service/__init__.py index c95e35d8252..bb37cf2cf4f 100644 --- a/openerp/service/__init__.py +++ b/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() diff --git a/openerp/tools/config.py b/openerp/tools/config.py index 71d1d015d91..bca0f8dc603 100644 --- a/openerp/tools/config.py +++ b/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): """ diff --git a/openerpcommand/initialize.py b/openerpcommand/initialize.py index 34c188bd583..44fb084bd1e 100644 --- a/openerpcommand/initialize.py +++ b/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.. 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) diff --git a/openerpcommand/run_tests.py b/openerpcommand/run_tests.py index 80e968b6fae..4000b227b90 100644 --- a/openerpcommand/run_tests.py +++ b/openerpcommand/run_tests.py @@ -120,7 +120,6 @@ def run(args): # Install the import hook, to import openerp.addons.. 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: diff --git a/openerpcommand/uninstall.py b/openerpcommand/uninstall.py index 9d5d93bda05..27e4e04002a 100644 --- a/openerpcommand/uninstall.py +++ b/openerpcommand/uninstall.py @@ -38,7 +38,6 @@ def run(args): # Install the import hook, to import openerp.addons.. openerp.modules.module.initialize_sys_path() - openerp.modules.loading.open_openerp_namespace() registry = openerp.modules.registry.RegistryManager.get( args.database, update_module=False)