Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
c7871c59
Commit
c7871c59
authored
Mar 23, 2013
by
Vinay Sajip
Browse files
Options
Browse Files
Download
Plain Diff
Issue #17521: Merged fix from 3.2.
parents
10e9127f
b19321cb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
4 deletions
+37
-4
Lib/logging/config.py
Lib/logging/config.py
+2
-2
Lib/test/test_logging.py
Lib/test/test_logging.py
+32
-2
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/logging/config.py
View file @
c7871c59
...
...
@@ -172,8 +172,8 @@ def _handle_existing_loggers(existing, child_loggers, disable_existing):
logger
.
level
=
logging
.
NOTSET
logger
.
handlers
=
[]
logger
.
propagate
=
True
el
if
disable_existing
:
logger
.
disabled
=
True
el
se
:
logger
.
disabled
=
disable_existing
def
_install_loggers
(
cp
,
handlers
,
disable_existing
):
"""Create and install loggers"""
...
...
Lib/test/test_logging.py
View file @
c7871c59
...
...
@@ -1257,9 +1257,30 @@ class ConfigFileTest(BaseTest):
datefmt=
"""
def apply_config(self, conf):
disable_test = """
[loggers]
keys=root
[handlers]
keys=screen
[formatters]
keys=
[logger_root]
level=DEBUG
handlers=screen
[handler_screen]
level=DEBUG
class=StreamHandler
args=(sys.stdout,)
formatter=
"""
def apply_config(self, conf, **kwargs):
file = io.StringIO(textwrap.dedent(conf))
logging.config.fileConfig(file)
logging.config.fileConfig(file
, **kwargs
)
def test_config0_ok(self):
# A simple config file which overrides the default settings.
...
...
@@ -1363,6 +1384,15 @@ class ConfigFileTest(BaseTest):
# Original logger output is empty.
self.assert_log_lines([])
def test_logger_disabling(self):
self.apply_config(self.disable_test)
logger = logging.getLogger('foo')
self.assertFalse(logger.disabled)
self.apply_config(self.disable_test)
self.assertTrue(logger.disabled)
self.apply_config(self.disable_test, disable_existing_loggers=False)
self.assertFalse(logger.disabled)
@unittest.skipUnless(threading, 'Threading required for this test.')
class SocketHandlerTest(BaseTest):
...
...
Misc/NEWS
View file @
c7871c59
...
...
@@ -196,6 +196,9 @@ Core and Builtins
Library
-------
- Issue #17521: Corrected non-enabling of logger following two calls to
fileConfig().
- Issue #17508: Corrected MemoryHandler configuration in dictConfig() where
the target handler wasn'
t
configured
first
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment