From ecbfcb6dcf2226b476cc0fca4d21f7a58cf97cc1 Mon Sep 17 00:00:00 2001 From: Julien Legros Date: Thu, 7 Sep 2017 16:10:53 +0200 Subject: [PATCH] [FIX] sql_db: use pycompat string_types --- odoo/sql_db.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/odoo/sql_db.py b/odoo/sql_db.py index 749abc69932..3a97bc47632 100644 --- a/odoo/sql_db.py +++ b/odoo/sql_db.py @@ -48,6 +48,7 @@ psycopg2.extensions.register_type(psycopg2.extensions.new_type((700, 701, 1700,) from . import tools from .tools.func import frame_codeinfo +from .tools import pycompat from .tools import parse_version as pv if pv(psycopg2.__version__) < pv('2.7'): @@ -58,8 +59,8 @@ if pv(psycopg2.__version__) < pv('2.7'): raise ValueError("A string literal cannot contain NUL (0x00) characters.") return QuotedString(adapted) - psycopg2.extensions.register_adapter(str, adapt_string) - psycopg2.extensions.register_adapter(unicode, adapt_string) + for type_ in pycompat.string_types: + psycopg2.extensions.register_adapter(type_, adapt_string) from datetime import timedelta import threading