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
6ea56d2e
Commit
6ea56d2e
authored
Aug 02, 2017
by
Preston Landers
Committed by
Vinay Sajip
Aug 02, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-31080: Allowed logging.config.fileConfig() to accept both args and kwargs. (GH-2979)
parent
de34cbe9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
5 deletions
+15
-5
Doc/library/logging.config.rst
Doc/library/logging.config.rst
+8
-1
Lib/logging/config.py
Lib/logging/config.py
+4
-2
Lib/test/test_logging.py
Lib/test/test_logging.py
+2
-2
Misc/NEWS.d/next/Library/2017-08-01-18-26-55.bpo-31080.2CFVCO.rst
...S.d/next/Library/2017-08-01-18-26-55.bpo-31080.2CFVCO.rst
+1
-0
No files found.
Doc/library/logging.config.rst
View file @
6ea56d2e
...
...
@@ -715,7 +715,12 @@ a corresponding section in the configuration file.
The ``args`` entry, when :func:`eval`\ uated in the context of the ``logging``
package'
s
namespace
,
is
the
list
of
arguments
to
the
constructor
for
the
handler
class
.
Refer
to
the
constructors
for
the
relevant
handlers
,
or
to
the
examples
below
,
to
see
how
typical
entries
are
constructed
.
below
,
to
see
how
typical
entries
are
constructed
.
If
not
provided
,
it
defaults
to
``()``.
The
optional
``
kwargs
``
entry
,
when
:
func
:`
eval
`\
uated
in
the
context
of
the
``
logging
``
package
's namespace, is the keyword argument dict to the constructor
for the handler class. If not provided, it defaults to ``{}``.
.. code-block:: ini
...
...
@@ -754,6 +759,7 @@ below, to see how typical entries are constructed.
level=WARN
formatter=form07
args=('
localhost
', '
from
@
abc
', ['
user1
@
abc
', '
user2
@
xyz
'], '
Logger
Subject
')
kwargs={'
timeout
': 10.0}
[handler_hand08]
class=handlers.MemoryHandler
...
...
@@ -767,6 +773,7 @@ below, to see how typical entries are constructed.
level=NOTSET
formatter=form09
args=('
localhost
:
9022
', '
/
log
', '
GET
')
kwargs={'
secure
': True}
Sections which specify formatter configuration are typified by the following.
...
...
Lib/logging/config.py
View file @
6ea56d2e
...
...
@@ -143,9 +143,11 @@ def _install_handlers(cp, formatters):
klass
=
eval
(
klass
,
vars
(
logging
))
except
(
AttributeError
,
NameError
):
klass
=
_resolve
(
klass
)
args
=
section
[
"args"
]
args
=
section
.
get
(
"args"
,
'()'
)
args
=
eval
(
args
,
vars
(
logging
))
h
=
klass
(
*
args
)
kwargs
=
section
.
get
(
"kwargs"
,
'{}'
)
kwargs
=
eval
(
kwargs
,
vars
(
logging
))
h
=
klass
(
*
args
,
**
kwargs
)
if
"level"
in
section
:
level
=
section
[
"level"
]
h
.
setLevel
(
level
)
...
...
Lib/test/test_logging.py
View file @
6ea56d2e
...
...
@@ -1273,7 +1273,7 @@ class ConfigFileTest(BaseTest):
datefmt=
"""
# config7 adds a compiler logger.
# config7 adds a compiler logger
, and uses kwargs instead of args
.
config7 = """
[loggers]
keys=root,parser,compiler
...
...
@@ -1304,7 +1304,7 @@ class ConfigFileTest(BaseTest):
class=StreamHandler
level=NOTSET
formatter=form1
args=(sys.stdout,)
kwargs={'stream': sys.stdout,}
[formatter_form1]
format=%(levelname)s ++ %(message)s
...
...
Misc/NEWS.d/next/Library/2017-08-01-18-26-55.bpo-31080.2CFVCO.rst
0 → 100644
View file @
6ea56d2e
Allow `logging.config.fileConfig` to accept kwargs and/or args.
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