"""
+import logging
+import openerp.conf.deprecation
from openerp.modules.registry import RegistryManager
-_Registries = None
+_logger = logging.getLogger(__name__)
-
-def ensure_registries():
- global _Registries
- if _Registries is None:
- _Registries = RegistryManager()
-
-
-def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False, pooljobs=True):
+def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False):
"""Create and return a database connection and a newly initialized registry."""
- ensure_registries()
- bound_registry = _Registries.get(db_name, force_demo, status, update_module, pooljobs)
- return bound_registry.db, bound_registry.registry
-
-
-def delete_pool(db_name):
- """Delete an existing registry."""
- ensure_registries()
- _Registries.delete(db_name)
+ assert openerp.conf.deprecation.openerp_pooler
+ _logger.warning('openerp.pooler.get_db_and_pool() is deprecated.')
+ registry = RegistryManager.get(db_name, force_demo, status, update_module)
+ return registry.db, registry
def restart_pool(db_name, force_demo=False, status=None, update_module=False):
"""Delete an existing registry and return a database connection and a newly initialized registry."""
- ensure_registries()
- bound_registry = _Registries.new(db_name, force_demo, status, update_module, True)
- return bound_registry.db, bound_registry.registry
-
+ _logger.warning('openerp.pooler.restart_pool() is deprecated.')
+ assert openerp.conf.deprecation.openerp_pooler
+ registry = RegistryManager.new(db_name, force_demo, status, update_module)
+ return registry.db, registry
def get_db(db_name):
"""Return a database connection. The corresponding registry is initialized."""
+ assert openerp.conf.deprecation.openerp_pooler
return get_db_and_pool(db_name)[0]
def get_pool(db_name, force_demo=False, status=None, update_module=False):
"""Return a model registry."""
+ assert openerp.conf.deprecation.openerp_pooler
return get_db_and_pool(db_name, force_demo, status, update_module)[1]
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: