diff options
author | Victor Stinner <vstinner@redhat.com> | 2018-10-16 15:52:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-16 15:52:37 +0200 |
commit | ed23ec4753e041a97f75591c6fcd26f0042b6a55 (patch) | |
tree | 17b21008d8c8faf50ca3d512e670c9a71aab4318 /Lib/logging/config.py | |
parent | b63845b1e68cc030232238ea6d5bf0dae9f32672 (diff) | |
download | cpython-git-revert-9703-master.tar.gz |
Revert "bpo-34844: logging.Formatter enhancement - Ensure style and format string matches in logging.Formatter (GH-9703)"revert-9703-master
This reverts commit 18fb1fb943b7dbd7f8a76017ee2a67ef13effb85.
Diffstat (limited to 'Lib/logging/config.py')
-rw-r--r-- | Lib/logging/config.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Lib/logging/config.py b/Lib/logging/config.py index cfd93116ee..fa1a398aee 100644 --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -666,19 +666,11 @@ class DictConfigurator(BaseConfigurator): dfmt = config.get('datefmt', None) style = config.get('style', '%') cname = config.get('class', None) - if not cname: c = logging.Formatter else: c = _resolve(cname) - - # A TypeError would be raised if "validate" key is passed in with a formatter callable - # that does not accept "validate" as a parameter - if 'validate' in config: # if user hasn't mentioned it, the default will be fine - result = c(fmt, dfmt, style, config['validate']) - else: - result = c(fmt, dfmt, style) - + result = c(fmt, dfmt, style) return result def configure_filter(self, config): |