commit 5957efdaf4b671ffe57133ce340d86bab9e9c87d Author: Isis Lovecruft isis@torproject.org Date: Wed Apr 2 14:14:17 2014 +0000
Remove pprinting of configuration changes from bridgedb.Main.
They went to stdout, not the logger, and they were annoying. --- lib/bridgedb/Main.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 8a1b650..d21239c 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -16,8 +16,6 @@ import logging import logging.handlers import gettext
-from pprint import pprint - from twisted.internet import reactor
from bridgedb import crypto @@ -267,8 +265,9 @@ def loadConfig(configFile=None, configCls=None): logging.info("Reloading over in-memory configurations...")
if (len(configuration) > 0) and itsSafeToUseLogging: - logging.debug("Old configuration settings:\n%s" - % pprint(configuration, depth=4)) + logging.debug("Old configuration settings:") + logging.debug("\n".join(["{key} = {value}".format(key, value) + for key, value in configuration]))
conffile = configFile if (configFile is None) and ('CONFIG_FILE' in configuration):