summaryrefslogtreecommitdiff
path: root/odoo
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-06-15 21:50:35 +0200
committerChristophe Simonis <chs@odoo.com>2017-06-15 21:50:35 +0200
commitfd78b89a02d3cee18b4aa8d4cc31694f6746328f (patch)
tree278dae3f794c8fd5c9114d2470eacfaeb97d87d9 /odoo
parented2ddeccdfaac46acb4d4bfbdac5f1b570f0829c (diff)
parentacfebff88079054b5b76104ab0825159acf88e0e (diff)
[MERGE] forward port branch saas-16 up to acfebff8807
Diffstat (limited to 'odoo')
-rw-r--r--odoo/sql_db.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/odoo/sql_db.py b/odoo/sql_db.py
index 7e416ba3b3f..f2448259e10 100644
--- a/odoo/sql_db.py
+++ b/odoo/sql_db.py
@@ -51,7 +51,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):