[REM] openerp.pooler: remove

3 files changed, 0 insertions, 46 deletions

diff --git a/openerp/__init__.py b/openerp/__init__.py
index 6c835e47b54..2fb8bdc5575 100644
--- a/openerp/__init__.py
+++ b/openerp/__init__.py
@@ -58,7 +58,6 @@ import loglevels
 import modules
 import netsvc
 import osv
-import pooler
 import release
 import report
 import service
diff --git a/openerp/conf/deprecation.py b/openerp/conf/deprecation.py
index 8eaf5d94b66..4f1c56c980f 100644
--- a/openerp/conf/deprecation.py
+++ b/openerp/conf/deprecation.py
@@ -34,8 +34,3 @@ allow_local_service = True
 # See comments for allow_local_service above.
 # Introduced around 2013.03.
 allow_report_int_registration = True
-
-# 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
diff --git a/openerp/pooler.py b/openerp/pooler.py
deleted file mode 100644
index 6a58ec9142e..00000000000
--- a/openerp/pooler.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-""" Functions kept for backward compatibility.
-
-    They are simple wrappers around a global RegistryManager methods.
-
-"""
-
-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]