diff options
Diffstat (limited to 'openstack/common/db/sqlalchemy/session.py')
| -rw-r--r-- | openstack/common/db/sqlalchemy/session.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/openstack/common/db/sqlalchemy/session.py b/openstack/common/db/sqlalchemy/session.py index 2c714b1..c6aeae6 100644 --- a/openstack/common/db/sqlalchemy/session.py +++ b/openstack/common/db/sqlalchemy/session.py @@ -246,12 +246,6 @@ import time from eventlet import db_pool from eventlet import greenthread -try: - import MySQLdb - from MySQLdb.constants import CLIENT as mysql_client_constants -except ImportError: - MySQLdb = None - mysql_client_constants = None from sqlalchemy.exc import DisconnectionError, OperationalError, IntegrityError import sqlalchemy.interfaces import sqlalchemy.orm @@ -259,10 +253,14 @@ from sqlalchemy.pool import NullPool, StaticPool from sqlalchemy.sql.expression import literal_column from openstack.common import cfg +from openstack.common import importutils from openstack.common import log as logging from openstack.common.gettextutils import _ from openstack.common import timeutils +MySQLdb = importutils.try_import('MySQLdb') +if MySQLdb is not None: + from MySQLdb.constants import CLIENT as mysql_client_constants sql_opts = [ cfg.StrOpt('sql_connection', |