From 2e6cfa6156f8dd94b76f1496fa0d1e4dde5a12db Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sun, 5 Dec 2021 21:19:52 +0100 Subject: [PATCH] tree_item_with_meta, test_long_index: add missing context managers Signed-off-by: Johannes Berg [rlb@defaultvalue.org: split from larger commit; adjust commit message] Signed-off-by: Rob Browning Reviewed-by: Rob Browning Tested-by: Rob Browning --- lib/bup/vfs.py | 7 ++++--- test/int/test_git.py | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/bup/vfs.py b/lib/bup/vfs.py index 683c9ac..ea15099 100644 --- a/lib/bup/vfs.py +++ b/lib/bup/vfs.py @@ -59,7 +59,7 @@ import re, sys from bup import git, vint from bup.compat import hexstr, pending_raise, range, str_type from bup.git import BUP_CHUNKED, parse_commit, tree_decode -from bup.helpers import debug2, last +from bup.helpers import debug2, last, nullcontext_if_not from bup.io import path_msg from bup.metadata import Metadata from bup.vint import read_bvec, write_bvec @@ -719,8 +719,9 @@ def tree_items_with_meta(repo, oid, tree_data, names): break if mangled_name > b'.bupm': break - for item in tree_items(oid, tree_data, names, bupm): - yield item + with nullcontext_if_not(bupm): + for item in tree_items(oid, tree_data, names, bupm): + yield item _save_name_rx = re.compile(br'^\d\d\d\d-\d\d-\d\d-\d{6}(-\d+)?$') diff --git a/test/int/test_git.py b/test/int/test_git.py index 616fc6e..2d9fcd7 100644 --- a/test/int/test_git.py +++ b/test/int/test_git.py @@ -193,10 +193,10 @@ def test_long_index(tmpdir): idx.add(obj3_bin, 3, 0xff) name = tmpdir + b'/tmp.idx' r = idx.write(name, pack_bin) - i = git.PackIdxV2(name, open(name, 'rb')) - WVPASSEQ(i.find_offset(obj_bin), 0xfffffffff) - WVPASSEQ(i.find_offset(obj2_bin), 0xffffffffff) - WVPASSEQ(i.find_offset(obj3_bin), 0xff) + with git.PackIdxV2(name, open(name, 'rb')) as i: + WVPASSEQ(i.find_offset(obj_bin), 0xfffffffff) + WVPASSEQ(i.find_offset(obj2_bin), 0xffffffffff) + WVPASSEQ(i.find_offset(obj3_bin), 0xff) def test_check_repo_or_die(tmpdir): -- 2.39.2