tree_item_with_meta, test_long_index: add missing context managers

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
[rlb@defaultvalue.org: split from larger commit; adjust commit message]
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Reviewed-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/bup/vfs.py b/lib/bup/vfs.py
index 683c9ac8a327bb9422dc3a352e4f5db0435b2278..ea150992ecf06aa599b3345acbbe54fa765353ea 100644 (file)
--- 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 616fc6e70451cd7626383ec0c095f79ada36a634..2d9fcd7bd775144972101107cc1bd2d7ce4aed66 100644 (file)
--- 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):