← Back to branch summary

~openerp-dev/openobject-server/trunk-partner_reference_terms-ypa

« back to all changes in this revision

Viewing changes to openerp/pooler.py

  • Committer: Richard Mathot (OpenERP)
  • Date: 2014-04-14 09:11:37 UTC
  • mfrom: (5120.1.60 origin/trunk)
  • Revision ID: rim@openerp.com-20140414091137-icatnn1humn7kisc
[MERGE] Sync with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
openerp/pooler.py
36
36
    assert openerp.conf.deprecation.openerp_pooler
37
37
    _logger.warning('openerp.pooler.get_db_and_pool() is deprecated.')
38
38
    registry = RegistryManager.get(db_name, force_demo, status, update_module)
39
 
    return registry.db, registry
 
39
    return registry._db, registry
40
40
 
41
41
 
42
42
def restart_pool(db_name, force_demo=False, status=None, update_module=False):
44
44
    _logger.warning('openerp.pooler.restart_pool() is deprecated.')
45
45
    assert openerp.conf.deprecation.openerp_pooler
46
46
    registry = RegistryManager.new(db_name, force_demo, status, update_module)
47
 
    return registry.db, registry
 
47
    return registry._db, registry
48
48
 
49
49
def get_db(db_name):
50
50
    """Return a database connection. The corresponding registry is initialized."""