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
843c76e9
Commit
843c76e9
authored
Mar 29, 2013
by
Vinay Sajip
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #17540: Added style to Formatter configuration by dict.
parent
15b57042
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
Lib/logging/config.py
Lib/logging/config.py
+4
-2
Lib/test/test_logging.py
Lib/test/test_logging.py
+4
-1
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Lib/logging/config.py
View file @
843c76e9
...
...
@@ -669,7 +669,8 @@ class DictConfigurator(BaseConfigurator):
else:
fmt = config.get('format', None)
dfmt = config.get('datefmt', None)
result = logging.Formatter(fmt, dfmt)
style = config.get('style', '%')
result = logging.Formatter(fmt, dfmt, style)
return result
def configure_filter(self, config):
...
...
@@ -691,6 +692,7 @@ class DictConfigurator(BaseConfigurator):
def configure_handler(self, config):
"""Configure a handler from a dictionary."""
config_copy = dict(config) # for restoring in case of error
formatter = config.pop('formatter', None)
if formatter:
try:
...
...
@@ -714,7 +716,7 @@ class DictConfigurator(BaseConfigurator):
try:
th = self.config['handlers'][config['target']]
if not isinstance(th, logging.Handler):
config
['class'] = cname # restore for deferred configuration
config
.update(config_copy) # restore for deferred cfg
raise TypeError('target not configured yet')
config['target'] = th
except Exception as e:
...
...
Lib/test/test_logging.py
View file @
843c76e9
...
...
@@ -2398,7 +2398,8 @@ class ConfigDictTest(BaseTest):
"
version
": 1,
"
formatters
": {
"
mySimpleFormatter
": {
"
format
": "
%
(
asctime
)
s
(
%
(
name
)
s
)
%
(
levelname
)
s
:
%
(
message
)
s
"
"
format
": "
%
(
asctime
)
s
(
%
(
name
)
s
)
%
(
levelname
)
s
:
%
(
message
)
s
",
"
style
": "
$
"
}
},
"
handlers
": {
...
...
@@ -2728,6 +2729,8 @@ class ConfigDictTest(BaseTest):
self.apply_config(self.out_of_order)
handler = logging.getLogger('mymodule').handlers[0]
self.assertIsInstance(handler.target, logging.Handler)
self.assertIsInstance(handler.formatter._style,
logging.StringTemplateStyle)
def test_baseconfig(self):
d = {
...
...
Misc/NEWS
View file @
843c76e9
...
...
@@ -200,6 +200,8 @@ Core and Builtins
Library
-------
-
Issue
#
17540
:
Added
style
to
formatter
configuration
by
dict
.
-
Issue
#
17536
:
Add
to
webbrowser
's browser list: www-browser, x-www-browser,
iceweasel, iceape.
...
...
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