summaryrefslogtreecommitdiff
path: root/odoo/sql_db.py
diff options
context:
space:
mode:
authorxmo-odoo <xmo@odoo.com>2017-04-27 13:59:33 +0200
committerGitHub <noreply@github.com>2017-04-27 13:59:33 +0200
commit2e6a589f417af48e3322955ffff6e94b6d8a24e3 (patch)
treeaa613ecc1f74a9531a03de89aa2bdc7bb32eed3b /odoo/sql_db.py
parentde4a2216b953abb86094c9bfa5f45b1eaaa79d3d (diff)
[FIX] builtins removed from Python 3
* Reverse wrapper courtesy of @rco-odoo's original P3 branch * thin compat module stripped down from werkzeug (to augment as needed) issue 8530
Diffstat (limited to 'odoo/sql_db.py')
-rw-r--r--odoo/sql_db.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/odoo/sql_db.py b/odoo/sql_db.py
index a7c7d6fc54d..214dbfca96c 100644
--- a/odoo/sql_db.py
+++ b/odoo/sql_db.py
@@ -21,6 +21,8 @@ import psycopg2.extensions
from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_REPEATABLE_READ
from psycopg2.pool import PoolError
+from .tools import pycompat
+
psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
_logger = logging.getLogger(__name__)
@@ -255,10 +257,8 @@ class Cursor(object):
sum = 0
if sqllogs[type]:
sqllogitems = sqllogs[type].items()
- sqllogitems.sort(key=lambda k: k[1][1])
_logger.debug("SQL LOG %s:", type)
- sqllogitems.sort(lambda x, y: cmp(x[1][0], y[1][0]))
- for r in sqllogitems:
+ for r in sorted(sqllogitems, key=lambda k: k[1]):
delay = timedelta(microseconds=r[1][1])
_logger.debug("table: %s: %s/%s", r[0], delay, r[1][0])
sum += r[1][1]
@@ -469,7 +469,7 @@ class LazyCursor(object):
if cr is None:
from odoo import registry
cr = self._cursor = registry(self.dbname).cursor()
- for _ in xrange(self._depth):
+ for _ in pycompat.range(self._depth):
cr.__enter__()
return getattr(cr, name)