diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2012-10-09 09:06:03 +0100 |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2012-10-09 09:06:03 +0100 |
| commit | 5ccedcbcf9a0ca00be99e8717317fb73b6efc44a (patch) | |
| tree | 9573c06abd0d0efa2d92bedf30a2f73dc9e85f9b /Lib/logging | |
| parent | 4e5f48806020d7696371833dac1969439b71792f (diff) | |
| download | cpython-5ccedcbcf9a0ca00be99e8717317fb73b6efc44a.tar.gz | |
Closes #16110: fileConfig now accepts a pre-initialised ConfigParser instance.
Diffstat (limited to 'Lib/logging')
| -rw-r--r-- | Lib/logging/config.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Lib/logging/config.py b/Lib/logging/config.py index 9ba3cca3bc..0694d21fe0 100644 --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -61,11 +61,14 @@ def fileConfig(fname, defaults=None, disable_existing_loggers=True): """ import configparser - cp = configparser.ConfigParser(defaults) - if hasattr(fname, 'readline'): - cp.read_file(fname) + if isinstance(fname, configparser.RawConfigParser): + cp = fname else: - cp.read(fname) + cp = configparser.ConfigParser(defaults) + if hasattr(fname, 'readline'): + cp.read_file(fname) + else: + cp.read(fname) formatters = _create_formatters(cp) |