From c53ca2f7766088388cfccb336e306cf0535f6c72 Mon Sep 17 00:00:00 2001 From: Sven Schliesing Date: Wed, 22 Apr 2015 20:32:39 +0200 Subject: [PATCH] use default value for parameter config_file in connect() --- database/mysql/mysql_user.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/database/mysql/mysql_user.py b/database/mysql/mysql_user.py index 90521e759fe..1f6d34c3565 100644 --- a/database/mysql/mysql_user.py +++ b/database/mysql/mysql_user.py @@ -183,11 +183,7 @@ class InvalidPrivsError(Exception): # MySQL module specific support methods. # -def connect(module, login_user, login_password, config_file): - default_file = '~/.my.cnf' - if config_file is not None: - default_file = config_file - +def connect(module, login_user, login_password, config_file='~/.my.cnf'): config = { 'host': module.params['login_host'], 'db': 'mysql' @@ -198,8 +194,8 @@ def connect(module, login_user, login_password, config_file): else: config['port'] = module.params['login_port'] - if os.path.exists(default_file): - config['read_default_file'] = default_file + if os.path.exists(config_file): + config['read_default_file'] = config_file else: config['user'] = login_user config['passwd'] = login_password