incubator-ponymail git commit: Simplify config handling by using fallback parameter

[se...@apache.org]

Repository: incubator-ponymail
Updated Branches:
  refs/heads/master 86bc12f30 -> cce4e09a0


Simplify config handling by using fallback parameter

Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/cce4e09a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/cce4e09a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/cce4e09a

Branch: refs/heads/master
Commit: cce4e09a0f3101437772da25eed6bdf64d097030
Parents: 86bc12f
Author: Sebb <se...@apache.org>
Authored: Tue Nov 1 17:19:17 2016 +0000
Committer: Sebb <se...@apache.org>
Committed: Tue Nov 1 17:19:17 2016 +0000

----------------------------------------------------------------------
 tools/import-mbox.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/cce4e09a/tools/import-mbox.py
----------------------------------------------------------------------
diff --git a/tools/import-mbox.py b/tools/import-mbox.py
index ad94eb9..0a37d0d 100755
--- a/tools/import-mbox.py
+++ b/tools/import-mbox.py
@@ -86,14 +86,10 @@ if config.has_option('elasticsearch', 'user'):
 
 
 
-ssl = False
 dbname = config.get("elasticsearch", "dbname")
-if config.has_option("elasticsearch", "ssl") and config.get("elasticsearch", "ssl").lower() == 'true':
-    ssl = True
+ssl = config.get("elasticsearch", "ssl", fallback = "False").lower() == 'true'
     
-uri = ""
-if config.has_option("elasticsearch", "uri") and config.get("elasticsearch", "uri") != "":
-    uri = config.get("elasticsearch", "uri")
+uri = config.get("elasticsearch", "uri", fallback = "")
 es = Elasticsearch([
     {
         'host': config.get("elasticsearch", "hostname"),