internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changing to read from a file pointer instead so that an exception is thrown if the file doesn't exist

Browse Source
This commit is contained in:
Mark Theunissen
2012-07-26 08:58:21 -05:00
parent 12979cf834
commit 6afe3fd497
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/mysql_db
View File

@@ -47,10 +47,10 @@ def db_create(cursor, db):
def load_mycnf():
config = ConfigParser.RawConfigParser()
mycnf = os.path.expanduser('~/.my.cnf')
config.read(mycnf)
try:
config.readfp(open(mycnf))
creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'pass'))
except ConfigParser.NoOptionError:
except (ConfigParser.NoOptionError, IOError):
return False
return creds

4
library/mysql_user
View File

@@ -145,10 +145,10 @@ def privileges_grant(cursor, user,host,db_table,priv):
def load_mycnf():
config = ConfigParser.RawConfigParser()
mycnf = os.path.expanduser('~/.my.cnf')
config.read(mycnf)
try:
config.readfp(open(mycnf))
creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'pass'))
except ConfigParser.NoOptionError:
except (ConfigParser.NoOptionError, IOError):
return False
return creds