openstack/deb-python-pymysql
Code Issues Proposed changes

Merge pull request #346 from methane/fix/config-priority

Browse Source 
Prefer argumet to config
This commit is contained in:
INADA Naoki
2015-06-01 14:03:57 +09:00
parent d376e65e73 ddc9a86cb8
commit f08f01fe8a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pymysql/connections.py
View File

@@ -597,11 +597,13 @@ class Connection(object):
cfg = configparser.RawConfigParser() cfg = configparser.RawConfigParser()
cfg.read(os.path.expanduser(read_default_file)) cfg.read(os.path.expanduser(read_default_file))
def _config(key, default): def _config(key, arg):
if arg:
return arg
try: try:
return cfg.get(read_default_group, key) return cfg.get(read_default_group, key)
except Exception: except Exception:
return default return arg
user = _config("user", user) user = _config("user", user)
password = _config("password", password) password = _config("password", password)