Merge pull request dbcli#880 from earboxer/emptypass

* Command Line: Allow specifying empty password

Author: amjith

changelog.md

@@ -27,6 +27,11 @@ Features:
 * Add an option `--list-ssh-config` to list ssh configurations.
 * Add an option `--ssh-config-path` to choose ssh configuration path.
 
+Bug Fixes:
+----------
+
+* Fix specifying empty password with `--password=''` when config file has a password set (Thanks: [Zach DeCook]).
+
 
 1.21.1
 ======
@@ -778,4 +783,5 @@ Bug Fixes:
 [François Pietka]: https://github.com/fpietka
 [Frederic Aoustin]: https://github.com/fraoustin
 [Georgy Frolov]: https://github.com/pasenor
+[Zach DeCook]: https://zachdecook.com
 [laixintao]: https://github.com/laixintao

mycli/AUTHORS

@@ -72,10 +72,10 @@ Contributors:
   * Jakub Boukal
   * Takeshi D. Itoh
   * laixintao
+  * Zach DeCook
   * kevinhwang91
   * KITAGAWA Yasutaka
 
-
 Creator:
 --------
 

mycli/main.py

@@ -396,7 +396,7 @@ def connect(self, database='', user='', passwd='', host='', port='',
         port = port or cnf['port']
         ssl = ssl or {}
 
-        passwd = passwd or cnf['password']
+        passwd = passwd if isinstance(passwd, str) else cnf['password']
         charset = charset or cnf['default-character-set'] or 'utf8'
 
         # Favor whichever local_infile option is set.