Skip to content

bpo-33802 - Fix regression in logging configuration #7509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
warsaw wants to merge 1 commit into from
Closed

bpo-33802 - Fix regression in logging configuration #7509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Lib/configparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,13 @@ def __init__(self, defaults=None, dict_type=_default_dict,
if converters is not _UNSET:
self._converters.update(converters)
if defaults:
self._read_defaults(defaults)
# For backward compatibility, defaults should do no interpolation.
try:
interpolation = self._interpolation
self._interpolation = Interpolation()
self._read_defaults(defaults)
finally:
self._interpolation = interpolation

def defaults(self):
return self._defaults
Expand Down
37 changes: 37 additions & 0 deletions Lib/test/test_logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1451,6 +1451,43 @@ def test_logger_disabling(self):
self.apply_config(self.disable_test, disable_existing_loggers=False)
self.assertFalse(logger.disabled)

def test_defaults_do_no_interpolation(self):
"""bpo-33802 defaults should not get interpolated"""
ini = textwrap.dedent("""
[formatters]
keys=default

[formatter_default]

[handlers]
keys=console

[handler_console]
class=logging.StreamHandler
args=tuple()

[loggers]
keys=root

[logger_root]
formatter=default
handlers=console
""").strip()
with tempfile.NamedTemporaryFile(mode='w+t', encoding='utf-8') as fp:
fp.write(ini)
fp.flush()
logging.config.fileConfig(fp.name, defaults=dict(
version=1,
disable_existing_loggers=False,
formatters={
"generic": {
"format": "%(asctime)s [%(process)d] [%(levelname)s] %(message)s",
"datefmt": "[%Y-%m-%d %H:%M:%S %z]",
"class": "logging.Formatter"
},
},
))


class SocketHandlerTest(BaseTest):

Expand Down