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
5abca702
Commit
5abca702
authored
Jan 23, 2015
by
Vinay Sajip
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #23207: logging.basicConfig() now does additional validation of its arguments.
parent
71e72960
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
8 deletions
+11
-8
Lib/logging/__init__.py
Lib/logging/__init__.py
+11
-8
No files found.
Lib/logging/__init__.py
View file @
5abca702
...
...
@@ -1723,7 +1723,7 @@ def basicConfig(**kwargs):
_acquireLock
()
try
:
if
len
(
root
.
handlers
)
==
0
:
handlers
=
kwargs
.
get
(
"handlers"
)
handlers
=
kwargs
.
pop
(
"handlers"
,
None
)
if
handlers
is
None
:
if
"stream"
in
kwargs
and
"filename"
in
kwargs
:
raise
ValueError
(
"'stream' and 'filename' should not be "
...
...
@@ -1733,28 +1733,31 @@ def basicConfig(**kwargs):
raise
ValueError
(
"'stream' or 'filename' should not be "
"specified together with 'handlers'"
)
if
handlers
is
None
:
filename
=
kwargs
.
get
(
"filename"
)
filename
=
kwargs
.
pop
(
"filename"
,
None
)
if
filename
:
mode
=
kwargs
.
get
(
"filemode"
,
'a'
)
mode
=
kwargs
.
pop
(
"filemode"
,
'a'
)
h
=
FileHandler
(
filename
,
mode
)
else
:
stream
=
kwargs
.
get
(
"stream"
)
stream
=
kwargs
.
pop
(
"stream"
,
None
)
h
=
StreamHandler
(
stream
)
handlers
=
[
h
]
dfs
=
kwargs
.
get
(
"datefmt"
,
None
)
style
=
kwargs
.
get
(
"style"
,
'%'
)
dfs
=
kwargs
.
pop
(
"datefmt"
,
None
)
style
=
kwargs
.
pop
(
"style"
,
'%'
)
if
style
not
in
_STYLES
:
raise
ValueError
(
'Style must be one of: %s'
%
','
.
join
(
_STYLES
.
keys
()))
fs
=
kwargs
.
get
(
"format"
,
_STYLES
[
style
][
1
])
fs
=
kwargs
.
pop
(
"format"
,
_STYLES
[
style
][
1
])
fmt
=
Formatter
(
fs
,
dfs
,
style
)
for
h
in
handlers
:
if
h
.
formatter
is
None
:
h
.
setFormatter
(
fmt
)
root
.
addHandler
(
h
)
level
=
kwargs
.
get
(
"level"
)
level
=
kwargs
.
pop
(
"level"
,
None
)
if
level
is
not
None
:
root
.
setLevel
(
level
)
if
kwargs
:
keys
=
', '
.
join
(
kwargs
.
keys
())
raise
ValueError
(
'Unrecognised argument(s): %s'
%
keys
)
finally
:
_releaseLock
()
...
...
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