mirror of
https://github.com/python/cpython.git
synced 2025-08-04 17:08:35 +00:00
Closes #21203: Updated fileConfig and dictConfig to remove inconsistencies. Thanks to Jure Koren for the patch.
This commit is contained in:
parent
4382ad6e02
commit
ddbd2ee6e5
2 changed files with 11 additions and 2 deletions
|
@ -116,11 +116,12 @@ def _create_formatters(cp):
|
|||
sectname = "formatter_%s" % form
|
||||
fs = cp.get(sectname, "format", raw=True, fallback=None)
|
||||
dfs = cp.get(sectname, "datefmt", raw=True, fallback=None)
|
||||
stl = cp.get(sectname, "style", raw=True, fallback='%')
|
||||
c = logging.Formatter
|
||||
class_name = cp[sectname].get("class")
|
||||
if class_name:
|
||||
c = _resolve(class_name)
|
||||
f = c(fs, dfs)
|
||||
f = c(fs, dfs, stl)
|
||||
formatters[form] = f
|
||||
return formatters
|
||||
|
||||
|
@ -660,7 +661,12 @@ class DictConfigurator(BaseConfigurator):
|
|||
fmt = config.get('format', None)
|
||||
dfmt = config.get('datefmt', None)
|
||||
style = config.get('style', '%')
|
||||
result = logging.Formatter(fmt, dfmt, style)
|
||||
cname = config.get('class', None)
|
||||
if not cname:
|
||||
c = logging.Formatter
|
||||
else:
|
||||
c = _resolve(cname)
|
||||
result = c(fmt, dfmt, style)
|
||||
return result
|
||||
|
||||
def configure_filter(self, config):
|
||||
|
|
|
@ -46,6 +46,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #21203: Updated fileConfig and dictConfig to remove inconsistencies.
|
||||
Thanks to Jure Koren for the patch.
|
||||
|
||||
- Issue #21197: Add lib64 -> lib symlink in venvs on 64-bit non-OS X POSIX.
|
||||
|
||||
- Issue #17498: Some SMTP servers disconnect after certain errors, violating
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue