[tor-commits] [bridgedb/master] Add GIMP_CAPTCHA_[RSA|HMAC]_KEYFILE settings to bridgedb.Main.loadConfig().

[isis at torproject.org]

commit 05a52c3f20fa364e103ba4acaca29282e1d3aca9
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Mar 11 21:04:32 2014 +0000

    Add GIMP_CAPTCHA_[RSA|HMAC]_KEYFILE settings to bridgedb.Main.loadConfig().
---
 lib/bridgedb/Main.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py
index e7dc153..1d78365 100644
--- a/lib/bridgedb/Main.py
+++ b/lib/bridgedb/Main.py
@@ -283,7 +283,8 @@ def loadConfig(configFile=None, configCls=None):
     for attr in ["DB_FILE", "DB_LOG_FILE", "MASTER_KEY_FILE", "PIDFILE",
                  "ASSIGNMENTS_FILE", "HTTPS_CERT_FILE", "HTTPS_KEY_FILE",
                  "LOG_FILE", "STATUS_FILE", "COUNTRY_BLOCK_FILE",
-                 "GIMP_CAPTCHA_DIR"]:
+                 "GIMP_CAPTCHA_DIR", "GIMP_CAPTCHA_HMAC_KEYFILE",
+                 "GIMP_CAPTCHA_RSA_KEYFILE"]:
         setting = getattr(config, attr, None)
         if setting is None:
             setattr(config, attr, setting)