diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-04-15 15:36:50 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-04-15 15:36:50 +0200 |
| commit | 3d2e9b4d2b6647016268ca3b5f7dd5c523a4fbb6 (patch) | |
| tree | 8014712ec2ae83aa443eebca36fe253249ef6173 /openerp/sql_db.py | |
| parent | f8d5ef0f80c216abd2e810edd4b9761c69c36dad (diff) | |
| parent | 001a034e587624e0bcca88b55d8cb5a580bec3a1 (diff) | |
[MERGE] forward port of branch 7.0 up to revid 5281 launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: jke@openerp.com-20140409153527-mic1a8afcvdhsd27
bzr revid: chs@openerp.com-20140410102422-fcwxhjk40z0oy8x5
bzr revid: chs@openerp.com-20140415133650-y46i0o3qkb2atbvi
Diffstat (limited to 'openerp/sql_db.py')
| -rw-r--r-- | openerp/sql_db.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openerp/sql_db.py b/openerp/sql_db.py index 694ae02b3d9..3eb50d84494 100644 --- a/openerp/sql_db.py +++ b/openerp/sql_db.py @@ -167,7 +167,7 @@ class Cursor(object): self.sql_log_count = 0 self.__closed = True # avoid the call of close() (by __del__) if an exception # is raised by any of the following initialisations - self._pool = pool + self.__pool = pool self.dbname = dbname # Whether to enable snapshot isolation level for this cursor. @@ -313,7 +313,7 @@ class Cursor(object): chosen_template = tools.config['db_template'] templates_list = tuple(set(['template0', 'template1', 'postgres', chosen_template])) keep_in_pool = self.dbname not in templates_list - self._pool.give_back(self._cnx, keep_in_pool=keep_in_pool) + self.__pool.give_back(self._cnx, keep_in_pool=keep_in_pool) @check def autocommit(self, on): @@ -484,12 +484,12 @@ class Connection(object): def __init__(self, pool, dbname): self.dbname = dbname - self._pool = pool + self.__pool = pool def cursor(self, serialized=True): cursor_type = serialized and 'serialized ' or '' _logger.debug('create %scursor to %r', cursor_type, self.dbname) - return Cursor(self._pool, self.dbname, serialized=serialized) + return Cursor(self.__pool, self.dbname, serialized=serialized) # serialized_cursor is deprecated - cursors are serialized by default serialized_cursor = cursor |