saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #26803 from twangboy/fix_26754

Browse source 
Added check for PyMySQL if MySQLdb import fails
This commit is contained in:
David Boucha 2015-09-01 16:44:41 -05:00
commit c892be3255
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/modules/mysql.py
View file

@ -49,13 +49,25 @@ import salt.utils
# Import third party libs
try:
# Try to import MySQLdb
import MySQLdb
import MySQLdb.cursors
import MySQLdb.converters
from MySQLdb.constants import FIELD_TYPE, FLAG
HAS_MYSQLDB = True
except ImportError:
HAS_MYSQLDB = False
try:
# MySQLdb import failed, try to import PyMySQL
import pymysql
pymysql.install_as_MySQLdb()
import MySQLdb
import MySQLdb.cursors
import MySQLdb.converters
from MySQLdb.constants import FIELD_TYPE, FLAG
HAS_MYSQLDB = True
except ImportError:
# No MySQL Connector installed, return False
HAS_MYSQLDB = False
log = logging.getLogger(__name__)