diff options
author | Daniel Speichert <DSpeichert@users.noreply.github.com> | 2018-09-19 17:44:05 +0200 |
---|---|---|
committer | Toshio Kuratomi <a.badger@gmail.com> | 2018-09-19 08:44:05 -0700 |
commit | d34cf93f1a7f96a14da1354b8f88a90c058e3e86 (patch) | |
tree | d548c9839db45bab8f9bb12138b321ec20f37bc4 /lib/ansible/modules/database/mysql/mysql_user.py | |
parent | 205693a3f94d5d0b8d3dc8c97ff457d68434f3a3 (diff) | |
download | ansible-d34cf93f1a7f96a14da1354b8f88a90c058e3e86.tar.gz |
Migrate from MySQLdb to PyMySQL (#40123)
* Migrate from MySQLdb to PyMySQL
* Deduplicate driver loading and failure message
* Explain requirements
* Apply requirements docs change to proxysql too
* Add changelog
Diffstat (limited to 'lib/ansible/modules/database/mysql/mysql_user.py')
-rw-r--r-- | lib/ansible/modules/database/mysql/mysql_user.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lib/ansible/modules/database/mysql/mysql_user.py b/lib/ansible/modules/database/mysql/mysql_user.py index 55a387143a..a796bb9596 100644 --- a/lib/ansible/modules/database/mysql/mysql_user.py +++ b/lib/ansible/modules/database/mysql/mysql_user.py @@ -196,16 +196,9 @@ import re import string import traceback -try: - import MySQLdb -except ImportError: - mysqldb_found = False -else: - mysqldb_found = True - from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.database import SQLParseError -from ansible.module_utils.mysql import mysql_connect, mysqldb_found +from ansible.module_utils.mysql import mysql_connect, mysql_driver, mysql_driver_fail_msg from ansible.module_utils.six import iteritems from ansible.module_utils._text import to_native @@ -578,8 +571,8 @@ def main(): db = 'mysql' sql_log_bin = module.params["sql_log_bin"] - if not mysqldb_found: - module.fail_json(msg="The MySQL-python module is required.") + if mysql_driver is None: + module.fail_json(msg=mysql_driver_fail_msg) cursor = None try: @@ -618,14 +611,14 @@ def main(): else: changed = user_mod(cursor, user, host, host_all, None, encrypted, priv, append_privs, module) - except (SQLParseError, InvalidPrivsError, MySQLdb.Error) as e: + except (SQLParseError, InvalidPrivsError, mysql_driver.Error) as e: module.fail_json(msg=to_native(e), exception=traceback.format_exc()) else: if host_all: module.fail_json(msg="host_all parameter cannot be used when adding a user") try: changed = user_add(cursor, user, host, host_all, password, encrypted, priv, module.check_mode) - except (SQLParseError, InvalidPrivsError, MySQLdb.Error) as e: + except (SQLParseError, InvalidPrivsError, mysql_driver.Error) as e: module.fail_json(msg=to_native(e), exception=traceback.format_exc()) elif state == "absent": if user_exists(cursor, user, host, host_all): |