@@ -1723,7 +1723,7 @@ def basicConfig(**kwargs):
1723
1723
_acquireLock ()
1724
1724
try :
1725
1725
if len (root .handlers ) == 0 :
1726
- handlers = kwargs .get ("handlers" )
1726
+ handlers = kwargs .pop ("handlers" , None )
1727
1727
if handlers is None :
1728
1728
if "stream" in kwargs and "filename" in kwargs :
1729
1729
raise ValueError ("'stream' and 'filename' should not be "
@@ -1733,28 +1733,31 @@ def basicConfig(**kwargs):
1733
1733
raise ValueError ("'stream' or 'filename' should not be "
1734
1734
"specified together with 'handlers'" )
1735
1735
if handlers is None :
1736
- filename = kwargs .get ("filename" )
1736
+ filename = kwargs .pop ("filename" , None )
1737
1737
if filename :
1738
- mode = kwargs .get ("filemode" , 'a' )
1738
+ mode = kwargs .pop ("filemode" , 'a' )
1739
1739
h = FileHandler (filename , mode )
1740
1740
else :
1741
- stream = kwargs .get ("stream" )
1741
+ stream = kwargs .pop ("stream" , None )
1742
1742
h = StreamHandler (stream )
1743
1743
handlers = [h ]
1744
- dfs = kwargs .get ("datefmt" , None )
1745
- style = kwargs .get ("style" , '%' )
1744
+ dfs = kwargs .pop ("datefmt" , None )
1745
+ style = kwargs .pop ("style" , '%' )
1746
1746
if style not in _STYLES :
1747
1747
raise ValueError ('Style must be one of: %s' % ',' .join (
1748
1748
_STYLES .keys ()))
1749
- fs = kwargs .get ("format" , _STYLES [style ][1 ])
1749
+ fs = kwargs .pop ("format" , _STYLES [style ][1 ])
1750
1750
fmt = Formatter (fs , dfs , style )
1751
1751
for h in handlers :
1752
1752
if h .formatter is None :
1753
1753
h .setFormatter (fmt )
1754
1754
root .addHandler (h )
1755
- level = kwargs .get ("level" )
1755
+ level = kwargs .pop ("level" , None )
1756
1756
if level is not None :
1757
1757
root .setLevel (level )
1758
+ if kwargs :
1759
+ keys = ', ' .join (kwargs .keys ())
1760
+ raise ValueError ('Unrecognised argument(s): %s' % keys )
1758
1761
finally :
1759
1762
_releaseLock ()
1760
1763
0 commit comments