[MERGE] forward port branch saas-17 up to 877e7098719

1 files changed, 2 insertions, 4 deletions

diff --git a/odoo/sql_db.py b/odoo/sql_db.py
index efc0e51972d..749abc69932 100644
--- a/odoo/sql_db.py
+++ b/odoo/sql_db.py
@@ -21,8 +21,6 @@ from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ
 from psycopg2.pool import PoolError
 from werkzeug import urls
 
-from .tools import pycompat
-
 psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
 
 _logger = logging.getLogger(__name__)
@@ -43,7 +41,7 @@ def undecimalize(symb, cr):
         return None
     return float(symb)
 
-for name, typeoid in pycompat.items(types_mapping):
+for name, typeoid in types_mapping.items():
     psycopg2.extensions.register_type(psycopg2.extensions.new_type(typeoid, name, lambda x, cr: x))
 psycopg2.extensions.register_type(psycopg2.extensions.new_type((700, 701, 1700,), 'float', undecimalize))
 
@@ -269,7 +267,7 @@ class Cursor(object):
             sqllogs = {'from': self.sql_from_log, 'into': self.sql_into_log}
             sum = 0
             if sqllogs[type]:
-                sqllogitems = pycompat.items(sqllogs[type])
+                sqllogitems = sqllogs[type].items()
                 _logger.debug("SQL LOG %s:", type)
                 for r in sorted(sqllogitems, key=lambda k: k[1]):
                     delay = timedelta(microseconds=r[1][1])