peter/borgmatic
1
0
Fork 0
mirror of https://github.com/borgmatic-collective/borgmatic.git synced 2026-07-22 02:03:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix shadowing of built-in function (#1331).

Browse Source
This commit is contained in:
Dan Helfman
2026-07-16 12:28:31 -07:00
parent eb5c9e6bf3
commit 5825af9fc1
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
borgmatic/logger.py
+3 -3
View File
@@ -380,9 +380,9 @@ def remove_log_exclude_filter(name):
Given a unique filter name, remove matching filters from each log handler.
'''
for handler in logging.getLogger().handlers:
for filter in handler.filters:
if getattr(filter, 'name', None) == name:
handler.removeFilter(filter)
for exclude_filter in handler.filters:
if getattr(exclude_filter, 'name', None) == name:
handler.removeFilter(exclude_filter)
class Logs_suppressed:
tests/unit/test_logger.py
+6 -6
View File
@@ -435,21 +435,21 @@ def test_log_prefix_sets_prefix_and_then_restores_original_prefix_after():
def test_log_exclude_filter_filter_omits_log_matching_any_attributes():
filter = module.Log_exclude_filter('my filter', {'foo': 'bar', 'baz': 'quux'})
exclude_filter = module.Log_exclude_filter('my filter', {'foo': 'bar', 'baz': 'quux'})
assert filter.filter(flexmock(foo='nope', baz='quux')) is False
assert exclude_filter.filter(flexmock(foo='nope', baz='quux')) is False
def test_log_exclude_filter_filter_includes_log_matching_no_attributes():
filter = module.Log_exclude_filter('my filter', {'foo': 'bar', 'baz': 'quux'})
exclude_filter = module.Log_exclude_filter('my filter', {'foo': 'bar', 'baz': 'quux'})
assert filter.filter(flexmock(foo='nope', baz='uh uh')) is True
assert exclude_filter.filter(flexmock(foo='nope', baz='uh uh')) is True
def test_log_exclude_filter_filter_includes_log_matching_no_attributes_and_in_fact_missing_them_entirely():
filter = module.Log_exclude_filter('my filter', {'foo': 'bar', 'baz': 'quux'})
exclude_filter = module.Log_exclude_filter('my filter', {'foo': 'bar', 'baz': 'quux'})
assert filter.filter(flexmock(other='nope', thing='uh uh')) is True
assert exclude_filter.filter(flexmock(other='nope', thing='uh uh')) is True
def test_add_log_exclude_filter_adds_filter_to_each_handler():