X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=openerp%2Fpooler.py;h=5ada4c2a0142396cdc86a863711a234ff673f731;hb=1f97c40c9c109165caef58ee1a87f925b5c7d884;hp=c754385d6b31a74c6a5777b64adaf9b17db98471;hpb=26f22874d98eb3fb68ae23a3f98cf37ab5d6b656;p=odoo%2Fodoo.git

diff --git a/openerp/pooler.py b/openerp/pooler.py
index c754385..5ada4c2 100644
--- a/openerp/pooler.py
+++ b/openerp/pooler.py
@@ -25,33 +25,36 @@
 
 """
 
+import logging
+import openerp.conf.deprecation
 from openerp.modules.registry import RegistryManager
 
+_logger = logging.getLogger(__name__)
 
-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."""
-    registry = RegistryManager.get(db_name, force_demo, status, update_module, pooljobs)
-    return registry.db, registry
-
-
-def delete_pool(db_name):
-    """Delete an existing registry."""
-    RegistryManager.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."""
-    registry = RegistryManager.new(db_name, force_demo, status, update_module, True)
-    return registry.db, 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: