starlingx
/
fault
Code Issues Proposed changes

Merge "Fix the conflict of urlparse between python2 and python3"

This commit is contained in:
Zuul 2018-11-09 18:15:59 +00:00 committed by Gerrit Code Review
parent 5dd702e05f 2e41ac07d5
commit fc6187d4fa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fm-rest-api/fm/fm/db/sqlalchemy/models.py
View File

@ -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"}