Archiver.build_filter: strip_components is no longer a optional parameter.

This commit is contained in:
Martin Hostettler 2016-08-22 23:07:38 +02:00
parent 972392e290
commit a026febdb0
2 changed files with 3 additions and 3 deletions

View File

@ -417,7 +417,7 @@ class Archiver:
self.print_file_status(status, path)
@staticmethod
def build_filter(matcher, peek_and_store_hardlink_masters, strip_components=0):
def build_filter(matcher, peek_and_store_hardlink_masters, strip_components):
if strip_components:
def item_filter(item):
peek_and_store_hardlink_masters(item)

View File

@ -2210,14 +2210,14 @@ class TestBuildFilter:
def test_basic(self):
matcher = PatternMatcher()
matcher.add([parse_pattern('included')], True)
filter = Archiver.build_filter(matcher, self.item_is_hardlink_master)
filter = Archiver.build_filter(matcher, self.item_is_hardlink_master, 0)
assert filter(Item(path='included'))
assert filter(Item(path='included/file'))
assert not filter(Item(path='something else'))
def test_empty(self):
matcher = PatternMatcher(fallback=True)
filter = Archiver.build_filter(matcher, self.item_is_hardlink_master)
filter = Archiver.build_filter(matcher, self.item_is_hardlink_master, 0)
assert filter(Item(path='anything'))
def test_strip_components(self):