From 2e41ac07d527b864217312c10dc39c1bba021629 Mon Sep 17 00:00:00 2001 From: brandonzhao Date: Fri, 26 Oct 2018 11:37:24 +0800 Subject: [PATCH] Fix the conflict of urlparse between python2 and python3 Story: 2003310 Task: 27860 Change-Id: Ib8e3932526af47ca0a7306b74000f8e108bd211d Signed-off-by: brandonzhao --- fm-rest-api/fm/fm/db/sqlalchemy/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fm-rest-api/fm/fm/db/sqlalchemy/models.py b/fm-rest-api/fm/fm/db/sqlalchemy/models.py index 824b3ebc..60a2309e 100755 --- a/fm-rest-api/fm/fm/db/sqlalchemy/models.py +++ b/fm-rest-api/fm/fm/db/sqlalchemy/models.py @@ -22,7 +22,7 @@ import json -import urlparse +from six.moves.urllib.parse import urlparse from oslo_config import cfg @@ -35,7 +35,7 @@ from oslo_db.sqlalchemy import models def table_args(): - engine_name = urlparse.urlparse(cfg.CONF.database_connection).scheme + engine_name = urlparse(cfg.CONF.database_connection).scheme if engine_name == 'mysql': return {'mysql_engine': 'InnoDB', 'mysql_charset': "utf8"}