File tree Expand file tree Collapse file tree 3 files changed +11
-8
lines changed Expand file tree Collapse file tree 3 files changed +11
-8
lines changed Original file line number Diff line number Diff line change 2121
2222logging .getLogger ("requests_oauthlib" ).addHandler (logging .NullHandler ())
2323logging .getLogger ("requests_oauthlib" ).addFilter (DebugModeTokenFilter ())
24+
25+ for filter_ in logging .getLogger ("requests_oauthlib" ).filters :
26+ if isinstance (filter_ , DebugModeTokenFilter ):
27+ if filter_ .mode == 'DEFAULT' :
28+ msg = "Your logger, when in DEBUG mode, will log TOKENS"
29+ logging .warning (msg )
30+ break
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ def __init__(self):
2020 environment variable.
2121 """
2222 super ().__init__ ()
23- self .mode = os .getenv ('DEBUG_MODE_TOKEN_FILTER' , 'DEFAULT' ).upper ()
23+ self .mode = os .getenv ('DEBUG_MODE_TOKEN_FILTER' , 'DEFAULT' ).upper ()
2424
2525 def filter (self , record ):
2626 """
@@ -37,7 +37,4 @@ def filter(self, record):
3737 record .msg = re .sub (r'Bearer (\w+)' , '[MASKED]' , record .getMessage ())
3838 elif self .mode == "SUPPRESS" :
3939 return False
40- elif self .mode == "DEFAULT" :
41- msg = "Your logger, when in DEBUG mode, will log TOKENS"
42- raise Warning (msg )
43- return True
40+ return True # if mode is not MASKED then DEFAULT is implied
Original file line number Diff line number Diff line change @@ -23,9 +23,8 @@ def test_suppress_mode(self):
2323 @patch .dict ('os.environ' , {'DEBUG_MODE_TOKEN_FILTER' : 'DEFAULT' })
2424 def test_default_mode_raises_warning (self ):
2525 filter = DebugModeTokenFilter ()
26- with self .assertRaises (Warning ) as context :
27- filter .filter (self .record )
28- self .assertTrue ("Your logger, when in DEBUG mode, will log TOKENS" in str (context .exception ))
26+ result = filter .filter (self .record )
27+ self .assertTrue (result )
2928
3029if __name__ == '__main__' :
3130 unittest .main ()
You can’t perform that action at this time.
0 commit comments