summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2002-11-14 12:52:17 (GMT)
committerGuido van Rossum <guido@python.org>2002-11-14 12:52:17 (GMT)
commit3165786dd19fca1b967b2f4c782d20bc2339a6e3 (patch)
treedae086bcd14ec2c23e5a400ebab5a11c85543475
parentde1d51fc12f05cdc1836ceaa20ae64f94fbb964b (diff)
downloadcpython-3165786dd19fca1b967b2f4c782d20bc2339a6e3.zip
cpython-3165786dd19fca1b967b2f4c782d20bc2339a6e3.tar.gz
cpython-3165786dd19fca1b967b2f4c782d20bc2339a6e3.tar.bz2
From SF patch 638299 [by Vinaj]: fileConfig() now takes an optional
defaults dictionary parameter which is passed to ConfigParser.
-rw-r--r--Lib/logging/config.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 760da08..4a7832b 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -40,7 +40,7 @@ DEFAULT_LOGGING_CONFIG_PORT = 9030
# _listener holds the server object doing the listening
_listener = None
-def fileConfig(fname):
+def fileConfig(fname, defaults=None):
"""
Read the logging configuration from a ConfigParser-format file.
@@ -55,7 +55,7 @@ def fileConfig(fname):
"""
import ConfigParser
- cp = ConfigParser.ConfigParser()
+ cp = ConfigParser.ConfigParser(defaults)
if hasattr(cp, 'readfp') and hasattr(fname, 'readline'):
cp.readfp(fname)
else: