[FIX] *: correct PY3 compatibility introduced by previous forward-ports
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||||
|
|
||||||
import models
|
from . import models
|
||||||
from openerp import api, SUPERUSER_ID
|
from odoo import api, SUPERUSER_ID
|
||||||
|
|
||||||
def _setup_inalterability(cr, registry):
|
def _setup_inalterability(cr, registry):
|
||||||
env = api.Environment(cr, SUPERUSER_ID, {})
|
env = api.Environment(cr, SUPERUSER_ID, {})
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
import res_company
|
from . import res_company
|
||||||
import account
|
from . import account
|
||||||
|
|||||||
+1
-1
@@ -55,7 +55,7 @@ psycopg2.extensions.register_type(psycopg2.extensions.new_type((700, 701, 1700,)
|
|||||||
from . import tools
|
from . import tools
|
||||||
from .tools.func import frame_codeinfo
|
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'):
|
if pv(psycopg2.__version__) < pv('2.7'):
|
||||||
from psycopg2._psycopg import QuotedString
|
from psycopg2._psycopg import QuotedString
|
||||||
def adapt_string(adapted):
|
def adapt_string(adapted):
|
||||||
|
|||||||
Reference in New Issue
Block a user