From 314a8dab70097847a10eb884f558f0f05b672698 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 27 Mar 2013 15:16:53 +0100
Subject: [PATCH] [REF] pooler: mark the functions as deprecated.

bzr revid: vmt@openerp.com-20130327141653-p7re4tknkwe1pc80
---
 openerp/conf/deprecation.py | 5 +++++
 openerp/pooler.py           | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/openerp/conf/deprecation.py b/openerp/conf/deprecation.py
index 11399bef4fb..caca00f5f26 100644
--- a/openerp/conf/deprecation.py
+++ b/openerp/conf/deprecation.py
@@ -35,4 +35,9 @@ by the user to check if her code is future proof.
 # Change to False around 2013.02.
 open_openerp_namespace = False
 
+# If True, the functions in openerp.pooler can be used.
+# Introduced around 2013.03 (actually they are deprecated since much longer
+# but no warning was dispayed in the logs).
+openerp_pooler = True
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/pooler.py b/openerp/pooler.py
index 58cf4936b27..0df6f88c819 100644
--- a/openerp/pooler.py
+++ b/openerp/pooler.py
@@ -25,27 +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):
     """Create and return a database connection and a newly initialized registry."""
+    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."""
+    _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: