Commit 6afe3fd4 by Mark Theunissen

Changing to read from a file pointer instead so that an exception is thrown if…

Changing to read from a file pointer instead so that an exception is thrown if the file doesn't exist
parent 12979cf8
...@@ -47,10 +47,10 @@ def db_create(cursor, db): ...@@ -47,10 +47,10 @@ def db_create(cursor, db):
def load_mycnf(): def load_mycnf():
config = ConfigParser.RawConfigParser() config = ConfigParser.RawConfigParser()
mycnf = os.path.expanduser('~/.my.cnf') mycnf = os.path.expanduser('~/.my.cnf')
config.read(mycnf)
try: try:
config.readfp(open(mycnf))
creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'pass')) creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'pass'))
except ConfigParser.NoOptionError: except (ConfigParser.NoOptionError, IOError):
return False return False
return creds return creds
......
...@@ -145,10 +145,10 @@ def privileges_grant(cursor, user,host,db_table,priv): ...@@ -145,10 +145,10 @@ def privileges_grant(cursor, user,host,db_table,priv):
def load_mycnf(): def load_mycnf():
config = ConfigParser.RawConfigParser() config = ConfigParser.RawConfigParser()
mycnf = os.path.expanduser('~/.my.cnf') mycnf = os.path.expanduser('~/.my.cnf')
config.read(mycnf)
try: try:
config.readfp(open(mycnf))
creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'pass')) creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'pass'))
except ConfigParser.NoOptionError: except (ConfigParser.NoOptionError, IOError):
return False return False
return creds return creds
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment