From acfebff88079054b5b76104ab0825159acf88e0e Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 15 Jun 2017 19:24:03 +0200 Subject: [PATCH] [FIX] *: correct PY3 compatibility introduced by previous forward-ports --- addons/l10n_fr_certification/__init__.py | 4 ++-- addons/l10n_fr_certification/models/__init__.py | 4 ++-- odoo/sql_db.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/l10n_fr_certification/__init__.py b/addons/l10n_fr_certification/__init__.py index 24644871f1e..dcd82374562 100644 --- a/addons/l10n_fr_certification/__init__.py +++ b/addons/l10n_fr_certification/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import models -from openerp import api, SUPERUSER_ID +from . import models +from odoo import api, SUPERUSER_ID def _setup_inalterability(cr, registry): env = api.Environment(cr, SUPERUSER_ID, {}) diff --git a/addons/l10n_fr_certification/models/__init__.py b/addons/l10n_fr_certification/models/__init__.py index 17a7d5cf526..8472b2f8bfb 100644 --- a/addons/l10n_fr_certification/models/__init__.py +++ b/addons/l10n_fr_certification/models/__init__.py @@ -1,2 +1,2 @@ -import res_company -import account +from . import res_company +from . import account diff --git a/odoo/sql_db.py b/odoo/sql_db.py index b4c69824ab2..acd422b5d33 100644 --- a/odoo/sql_db.py +++ b/odoo/sql_db.py @@ -55,7 +55,7 @@ psycopg2.extensions.register_type(psycopg2.extensions.new_type((700, 701, 1700,) from . import tools from .tools.func import frame_codeinfo -from tools import parse_version as pv +from .tools import parse_version as pv if pv(psycopg2.__version__) < pv('2.7'): from psycopg2._psycopg import QuotedString def adapt_string(adapted):