uproot 5.3.5__tar.gz → 5.3.7__tar.gz

{uproot-5.3.5 → uproot-5.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uproot
-Version: 5.3.5
+Version: 5.3.7
 Summary: ROOT I/O in pure Python and NumPy.
 Project-URL: Download, https://github.com/scikit-hep/uproot5/releases
 Project-URL: Homepage, https://github.com/scikit-hep/uproot5

{uproot-5.3.5 → uproot-5.3.7}/src/uproot/behaviors/TBranch.py

@@ -1424,7 +1424,7 @@ class HasBranches(Mapping):
                     if filter_name is no_filter or _filter_name_deep(
                         filter_name, self, v
                     ):
-                        if ignore_duplicates and branch.name in keys_set:
+                        if ignore_duplicates and k2 in keys_set:
                             pass
                         else:
                             keys_set.add(k2)

{uproot-5.3.5 → uproot-5.3.7}/src/uproot/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '5.3.5'
-__version_tuple__ = version_tuple = (5, 3, 5)
+__version__ = version = '5.3.7'
+__version_tuple__ = version_tuple = (5, 3, 7)

{uproot-5.3.5 → uproot-5.3.7}/src/uproot/writing/_cascade.py

@@ -2159,8 +2159,10 @@ class FileHeader(CascadeLeaf):
                 uuid_bytes,
             ) = uproot.reading._file_header_fields_big.unpack(raw_bytes)
             assert units == 8
+            outversion = version - 1000000
         else:
             assert units == 4
+            outversion = version
 
         assert begin >= uproot.reading._file_header_fields_small.size
         assert free_location >= 0
@@ -2183,7 +2185,7 @@ class FileHeader(CascadeLeaf):
             info_num_bytes,
             uuid.UUID(bytes=uuid_bytes),
         )
-        out._version = version - 1000000
+        out._version = outversion
         out._begin = begin
         return out
 

uproot-5.3.7/tests/test_1212_dont_let_update_mess_up_file_version.py

@@ -0,0 +1,18 @@
+# BSD 3-Clause License; see https://github.com/scikit-hep/uproot5/blob/main/LICENSE
+
+import os
+
+import uproot
+
+
+def test(tmp_path):
+    filename = os.path.join(tmp_path, "whatever.root")
+
+    with uproot.recreate(filename) as file:
+        file["one"] = "one"
+
+    with uproot.update(filename) as file:
+        file["two"] = "two"
+
+    with uproot.open(filename) as file:
+        assert file.file.fVersion == uproot.writing._cascade.FileHeader.class_version