uproot 5.3.2rc1__tar.gz → 5.3.4__tar.gz

{uproot-5.3.2rc1 → uproot-5.3.4}/.all-contributorsrc

@@ -560,6 +560,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "djw9497",
+      "name": "djw9497",
+      "avatar_url": "https://avatars.githubusercontent.com/u/51672890?v=4",
+      "profile": "https://github.com/djw9497",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

{uproot-5.3.2rc1 → uproot-5.3.4}/.github/workflows/build-test.yml

@@ -92,3 +92,27 @@ jobs:
       - name: Run pytest
         run: |
           python -m pytest -vv tests --reruns 10 --reruns-delay 30 --only-rerun "(?i)http|ssl|timeout|expired|connection|socket"
+
+  numpy2-build:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [windows-latest, ubuntu-latest, macos-latest]
+        python-version: ['3.11']
+
+    runs-on: ${{ matrix.platform }}
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Pip install the package
+        run: python -m pip install 'numpy>=2.0.0b1' .[test]
+
+      - name: Run pytest
+        run: |
+          python -m pytest -vv tests --reruns 10 --reruns-delay 30 --only-rerun "(?i)http|ssl|timeout|expired|connection|socket"

{uproot-5.3.2rc1 → uproot-5.3.4}/.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -18,25 +18,25 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.2.0
+    rev: 24.4.2
     hooks:
       - id: black
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.2
+    rev: v0.4.2
     hooks:
       - id: ruff
         args: [--fix, --show-fixes]
 
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.1
+    rev: v3.15.2
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
 
   - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-    rev: v2.12.0
+    rev: v2.13.0
     hooks:
       - id: pretty-format-toml
         args: [--autofix]

{uproot-5.3.2rc1 → uproot-5.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uproot
-Version: 5.3.2rc1
+Version: 5.3.4
 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
@@ -254,6 +254,7 @@ Thanks especially to the gracious help of Uproot contributors (including the [or
       <td align="center" valign="top" width="14.28%"><a href="http://tooldev.de"><img src="https://avatars.githubusercontent.com/u/1640386?v=4?s=100" width="100px;" alt="Robin Sonnabend"/><br /><sub><b>Robin Sonnabend</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=YSelfTool" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/bojohnson5"><img src="https://avatars.githubusercontent.com/u/20647190?v=4?s=100" width="100px;" alt="Bo Johnson"/><br /><sub><b>Bo Johnson</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=bojohnson5" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/milesgranger"><img src="https://avatars.githubusercontent.com/u/13764397?v=4?s=100" width="100px;" alt="Miles"/><br /><sub><b>Miles</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=milesgranger" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/djw9497"><img src="https://avatars.githubusercontent.com/u/51672890?v=4?s=100" width="100px;" alt="djw9497"/><br /><sub><b>djw9497</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=djw9497" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

{uproot-5.3.2rc1 → uproot-5.3.4}/README.md

@@ -186,6 +186,7 @@ Thanks especially to the gracious help of Uproot contributors (including the [or
       <td align="center" valign="top" width="14.28%"><a href="http://tooldev.de"><img src="https://avatars.githubusercontent.com/u/1640386?v=4?s=100" width="100px;" alt="Robin Sonnabend"/><br /><sub><b>Robin Sonnabend</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=YSelfTool" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/bojohnson5"><img src="https://avatars.githubusercontent.com/u/20647190?v=4?s=100" width="100px;" alt="Bo Johnson"/><br /><sub><b>Bo Johnson</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=bojohnson5" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/milesgranger"><img src="https://avatars.githubusercontent.com/u/13764397?v=4?s=100" width="100px;" alt="Miles"/><br /><sub><b>Miles</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=milesgranger" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/djw9497"><img src="https://avatars.githubusercontent.com/u/51672890?v=4?s=100" width="100px;" alt="djw9497"/><br /><sub><b>djw9497</b></sub></a><br /><a href="https://github.com/scikit-hep/uproot5/commits?author=djw9497" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

{uproot-5.3.2rc1 → uproot-5.3.4}/src/uproot/__init__.py

@@ -147,6 +147,7 @@ import uproot.models.RNTuple
 import uproot.models.TH
 import uproot.models.TGraph
 import uproot.models.TMatrixT
+import uproot.models.TTime
 
 from uproot.models.TTree import num_entries
 

{uproot-5.3.2rc1 → uproot-5.3.4}/src/uproot/_dask.py

@@ -606,6 +606,7 @@ def _get_dask_array(
                 filter_typename=filter_typename,
                 filter_branch=real_filter_branch,
                 full_paths=full_paths,
+                ignore_duplicates=True,
             )
 
             if common_keys is None:
@@ -627,12 +628,7 @@ def _get_dask_array(
         raise ValueError(
             "allow_missing=True and no TTrees found in\n\n    {}".format(
                 "\n    ".join(
-                    "{"
-                    + "{}: {}".format(
-                        repr(f.file_path if isinstance(f, HasBranches) else f),
-                        repr(f.object_path if isinstance(f, HasBranches) else o),
-                    )
-                    + "}"
+                    f"{{{f.file_path if isinstance(f, HasBranches) else f!r}: {f.object_path if isinstance(f, HasBranches) else o!r}}}"
                     for f, o in files
                 )
             )
@@ -642,12 +638,7 @@ def _get_dask_array(
         raise ValueError(
             "TTrees in\n\n    {}\n\nhave no TBranches in common".format(
                 "\n    ".join(
-                    "{"
-                    + "{}: {}".format(
-                        repr(f.file_path if isinstance(f, HasBranches) else f),
-                        repr(f.object_path if isinstance(f, HasBranches) else o),
-                    )
-                    + "}"
+                    f"{{{f.file_path if isinstance(f, HasBranches) else f!r}: {f.object_path if isinstance(f, HasBranches) else o!r}}}"
                     for f, o in files
                 )
             )
@@ -757,6 +748,7 @@ def _get_dask_array_delay_open(
         filter_typename=filter_typename,
         filter_branch=filter_branch,
         full_paths=full_paths,
+        ignore_duplicates=True,
     )
 
     dask_dict = {}
@@ -1451,6 +1443,7 @@ def _get_dak_array(
                 filter_typename=filter_typename,
                 filter_branch=real_filter_branch,
                 full_paths=full_paths,
+                ignore_duplicates=True,
             )
 
             if common_keys is None:
@@ -1472,12 +1465,7 @@ def _get_dak_array(
         raise ValueError(
             "allow_missing=True and no TTrees found in\n\n    {}".format(
                 "\n    ".join(
-                    "{"
-                    + "{}: {}".format(
-                        repr(f.file_path if isinstance(f, HasBranches) else f),
-                        repr(f.object_path if isinstance(f, HasBranches) else o),
-                    )
-                    + "}"
+                    f"{{{f.file_path if isinstance(f, HasBranches) else f!r}: {f.object_path if isinstance(f, HasBranches) else o!r}}}"
                     for f, o in files
                 )
             )
@@ -1487,12 +1475,7 @@ def _get_dak_array(
         raise ValueError(
             "TTrees in\n\n    {}\n\nhave no TBranches in common".format(
                 "\n    ".join(
-                    "{"
-                    + "{}: {}".format(
-                        repr(f.file_path if isinstance(f, HasBranches) else f),
-                        repr(f.object_path if isinstance(f, HasBranches) else o),
-                    )
-                    + "}"
+                    f"{{{f.file_path if isinstance(f, HasBranches) else f!r}: {f.object_path if isinstance(f, HasBranches) else o!r}}}"
                     for f, o in files
                 )
             )
@@ -1606,7 +1589,7 @@ def _get_dak_array_delay_open(
     ffile_path, fobject_path = files[0][0:2]
 
     if known_base_form is not None:
-        common_keys = list(known_base_form.fields)
+        common_keys = list(dict.fromkeys(known_base_form.fields))
         base_form = known_base_form
     else:
         obj = uproot._util.regularize_object_path(
@@ -1618,6 +1601,7 @@ def _get_dak_array_delay_open(
             filter_typename=filter_typename,
             filter_branch=filter_branch,
             full_paths=full_paths,
+            ignore_duplicates=True,
         )
         base_form = _get_ttree_form(
             awkward, obj, common_keys, interp_options.get("ak_add_doc")

{uproot-5.3.2rc1 → uproot-5.3.4}/src/uproot/_util.py

@@ -13,6 +13,7 @@ import itertools
 import numbers
 import os
 import re
+import sys
 import warnings
 from collections.abc import Iterable
 from pathlib import Path
@@ -27,6 +28,8 @@ import uproot.source.chunk
 import uproot.source.fsspec
 import uproot.source.object
 
+macos = sys.platform == "darwin"
+
 
 def tobytes(array):
     """
@@ -80,7 +83,9 @@ def ensure_numpy(array, types=(numpy.bool_, numpy.integer, numpy.floating)):
 
     awkward = uproot.extras.awkward()
     with warnings.catch_warnings():
-        warnings.simplefilter("error", numpy.VisibleDeprecationWarning)
+        warnings.simplefilter(
+            "error", getattr(numpy, "exceptions", numpy).VisibleDeprecationWarning
+        )
         if isinstance(array, awkward.contents.Content):
             out = awkward.to_numpy(array)
         else:

{uproot-5.3.2rc1 → uproot-5.3.4}/src/uproot/behaviors/TBranch.py

@@ -627,11 +627,7 @@ class HasBranches(Mapping):
         if interpretation_width < 3:
             raise ValueError("'interpretation_width' must be at least 3")
 
-        formatter = "{{0:{0}.{0}}} | {{1:{1}.{1}}} | {{2:{2}.{2}}}".format(
-            name_width,
-            typename_width,
-            interpretation_width,
-        )
+        formatter = f"{{0:{name_width}.{name_width}}} | {{1:{typename_width}.{typename_width}}} | {{2:{interpretation_width}.{interpretation_width}}}"
 
         stream.write(formatter.format("name", "typename", "interpretation"))
         stream.write(
@@ -792,14 +788,7 @@ class HasBranches(Mapping):
 
         def get_from_cache(branchname, interpretation):
             if array_cache is not None:
-                cache_key = "{}:{}:{}:{}-{}:{}".format(
-                    self.cache_key,
-                    branchname,
-                    interpretation.cache_key,
-                    entry_start,
-                    entry_stop,
-                    library.name,
-                )
+                cache_key = f"{self.cache_key}:{branchname}:{interpretation.cache_key}:{entry_start}-{entry_stop}:{library.name}"
                 return array_cache.get(cache_key)
             else:
                 return None
@@ -865,14 +854,7 @@ class HasBranches(Mapping):
                         checked.add(branch.cache_key)
                         interpretation = branchid_interpretation[branch.cache_key]
                         if branch is not None:
-                            cache_key = "{}:{}:{}:{}-{}:{}".format(
-                                self.cache_key,
-                                expression,
-                                interpretation.cache_key,
-                                entry_start,
-                                entry_stop,
-                                library.name,
-                            )
+                            cache_key = f"{self.cache_key}:{expression}:{interpretation.cache_key}:{entry_start}-{entry_stop}:{library.name}"
                         array_cache[cache_key] = arrays[branch.cache_key]
 
         output = language.compute_expressions(
@@ -1144,6 +1126,7 @@ class HasBranches(Mapping):
         filter_branch=no_filter,
         recursive=True,
         full_paths=True,
+        ignore_duplicates=False,
     ):
         """
         Args:
@@ -1161,6 +1144,7 @@ class HasBranches(Mapping):
             full_paths (bool): If True, include the full path to each subbranch
                 with slashes (``/``); otherwise, use the descendant's name as
                 the output name.
+            ignore_duplicates (bool): If True, return a set of the keys; otherwise, return the full list of keys.
 
         Returns the names of the subbranches as a list of strings.
         """
@@ -1171,6 +1155,7 @@ class HasBranches(Mapping):
                 filter_branch=filter_branch,
                 recursive=recursive,
                 full_paths=full_paths,
+                ignore_duplicates=ignore_duplicates,
             )
         )
 
@@ -1297,6 +1282,7 @@ class HasBranches(Mapping):
         filter_branch=no_filter,
         recursive=True,
         full_paths=True,
+        ignore_duplicates=False,
     ):
         """
         Args:
@@ -1314,6 +1300,8 @@ class HasBranches(Mapping):
             full_paths (bool): If True, include the full path to each subbranch
                 with slashes (``/``); otherwise, use the descendant's name as
                 the output name.
+            ignore_duplicates (bool): If True, return a set of the keys; otherwise, return the full list of keys.
+
 
         Returns the names of the subbranches as an iterator over strings.
         """
@@ -1323,6 +1311,7 @@ class HasBranches(Mapping):
             filter_branch=filter_branch,
             recursive=recursive,
             full_paths=full_paths,
+            ignore_duplicates=ignore_duplicates,
         ):
             yield k
 
@@ -1371,6 +1360,7 @@ class HasBranches(Mapping):
         filter_branch=no_filter,
         recursive=True,
         full_paths=True,
+        ignore_duplicates=False,
     ):
         """
         Args:
@@ -1388,6 +1378,8 @@ class HasBranches(Mapping):
             full_paths (bool): If True, include the full path to each subbranch
                 with slashes (``/``) in the name; otherwise, use the descendant's
                 name as the name without modification.
+            ignore_duplicates (bool): If True, return a set of the keys; otherwise, return the full list of keys.
+
 
         Returns (name, branch) pairs of the subbranches as an iterator over
         2-tuples of (str, :doc:`uproot.behaviors.TBranch.TBranch`).
@@ -1400,11 +1392,11 @@ class HasBranches(Mapping):
             pass
         else:
             raise TypeError(
-                "filter_branch must be None or a function: TBranch -> bool, not {}".format(
-                    repr(filter_branch)
-                )
+                f"filter_branch must be None or a function: TBranch -> bool, not {filter_branch!r}"
             )
 
+        keys_set = set()
+
         for branch in self.branches:
             if (
                 (
@@ -1414,7 +1406,11 @@ class HasBranches(Mapping):
                 and (filter_typename is no_filter or filter_typename(branch.typename))
                 and (filter_branch is no_filter or filter_branch(branch))
             ):
-                yield branch.name, branch
+                if ignore_duplicates and branch.name in keys_set:
+                    pass
+                else:
+                    keys_set.add(branch.name)
+                    yield branch.name, branch
 
             if recursive:
                 for k1, v in branch.iteritems(
@@ -1428,7 +1424,11 @@ class HasBranches(Mapping):
                     if filter_name is no_filter or _filter_name_deep(
                         filter_name, self, v
                     ):
-                        yield k2, v
+                        if ignore_duplicates and branch.name in keys_set:
+                            pass
+                        else:
+                            keys_set.add(k2)
+                            yield k2, v
 
     def itertypenames(
         self,
@@ -1701,9 +1701,7 @@ class TBranch(HasBranches):
         if len(self) == 0:
             return f"<{self.classname} {self.name!r} at 0x{id(self):012x}>"
         else:
-            return "<{} {} ({} subbranches) at 0x{:012x}>".format(
-                self.classname, repr(self.name), len(self), id(self)
-            )
+            return f"<{self.classname} {self.name!r} ({len(self)} subbranches) at 0x{id(self):012x}>"
 
     def array(
         self,
@@ -1781,14 +1779,7 @@ class TBranch(HasBranches):
 
         def get_from_cache(branchname, interpretation):
             if array_cache is not None:
-                cache_key = "{}:{}:{}:{}-{}:{}".format(
-                    self.cache_key,
-                    branchname,
-                    interpretation.cache_key,
-                    entry_start,
-                    entry_stop,
-                    library.name,
-                )
+                cache_key = f"{self.cache_key}:{branchname}:{interpretation.cache_key}:{entry_start}-{entry_stop}:{library.name}"
                 return array_cache.get(cache_key)
             else:
                 return None
@@ -1849,14 +1840,7 @@ class TBranch(HasBranches):
         )
 
         if array_cache is not None:
-            cache_key = "{}:{}:{}:{}-{}:{}".format(
-                self.cache_key,
-                self.name,
-                interpretation.cache_key,
-                entry_start,
-                entry_stop,
-                library.name,
-            )
+            cache_key = f"{self.cache_key}:{self.name}:{interpretation.cache_key}:{entry_start}-{entry_stop}:{library.name}"
             array_cache[cache_key] = arrays[self.cache_key]
 
         return arrays[self.cache_key]
@@ -2004,14 +1988,9 @@ class TBranch(HasBranches):
             )
         ):
             raise ValueError(
-                """entries in normal baskets ({}) plus embedded baskets ({}) """
-                """don't add up to expected number of entries ({})
-in file {}""".format(
-                    num_entries_normal,
-                    sum(basket.num_entries for basket in self.embedded_baskets),
-                    self.num_entries,
-                    self._file.file_path,
-                )
+                f"""entries in normal baskets ({num_entries_normal}) plus embedded baskets ({sum(basket.num_entries for basket in self.embedded_baskets)}) """
+                f"""don't add up to expected number of entries ({self.num_entries})
+in file {self._file.file_path}"""
             )
         else:
             return out
@@ -2041,11 +2020,9 @@ in file {}""".format(
 
         else:
             raise IndexError(
-                """branch {} has {} baskets; cannot get starting entry """
-                """for basket {}
-in file {}""".format(
-                    repr(self.name), self.num_baskets, basket_num, self._file.file_path
-                )
+                f"""branch {self.name!r} has {self.num_baskets} baskets; cannot get starting entry """
+                f"""for basket {basket_num}
+in file {self._file.file_path}"""
             )
 
     @property
@@ -2260,10 +2237,8 @@ in file {}""".format(
             return self.embedded_baskets[basket_num - self._num_normal_baskets]
         else:
             raise IndexError(
-                """branch {} has {} baskets; cannot get basket {}
-in file {}""".format(
-                    repr(self.name), self.num_baskets, basket_num, self._file.file_path
-                )
+                f"""branch {self.name!r} has {self.num_baskets} baskets; cannot get basket {basket_num}
+in file {self._file.file_path}"""
             )
 
     def basket_chunk_cursor(self, basket_num):
@@ -2286,22 +2261,15 @@ in file {}""".format(
             return chunk, cursor
         elif 0 <= basket_num < self.num_baskets:
             raise IndexError(
-                """branch {} has {} normal baskets; cannot get chunk and """
-                """cursor for basket {} because only normal baskets have cursors
-in file {}""".format(
-                    repr(self.name),
-                    self._num_normal_baskets,
-                    basket_num,
-                    self._file.file_path,
-                )
+                f"""branch {self.name!r} has {self._num_normal_baskets} normal baskets; cannot get chunk and """
+                f"""cursor for basket {basket_num} because only normal baskets have cursors
+in file {self._file.file_path}"""
             )
         else:
             raise IndexError(
-                """branch {} has {} baskets; cannot get cursor and chunk """
-                """for basket {}
-in file {}""".format(
-                    repr(self.name), self.num_baskets, basket_num, self._file.file_path
-                )
+                f"""branch {self.name!r} has {self.num_baskets} baskets; cannot get cursor and chunk """
+                f"""for basket {basket_num}
+in file {self._file.file_path}"""
             )
 
     def basket_compressed_bytes(self, basket_num):
@@ -2321,10 +2289,8 @@ in file {}""".format(
             ].compressed_bytes
         else:
             raise IndexError(
-                """branch {} has {} baskets; cannot get basket chunk {}
-in file {}""".format(
-                    repr(self.name), self.num_baskets, basket_num, self._file.file_path
-                )
+                f"""branch {self.name!r} has {self.num_baskets} baskets; cannot get basket chunk {basket_num}
+in file {self._file.file_path}"""
             )
 
     def basket_uncompressed_bytes(self, basket_num):
@@ -2363,17 +2329,13 @@ in file {}""".format(
 
         elif 0 <= basket_num < self.num_baskets:
             raise ValueError(
-                "branch {} basket {} is an embedded basket, which has no TKey".format(
-                    repr(self.name), basket_num
-                )
+                f"branch {self.name!r} basket {basket_num} is an embedded basket, which has no TKey"
             )
 
         else:
             raise IndexError(
-                """branch {} has {} baskets; cannot get basket chunk {}
-in file {}""".format(
-                    repr(self.name), self.num_baskets, basket_num, self._file.file_path
-                )
+                f"""branch {self.name!r} has {self.num_baskets} baskets; cannot get basket chunk {basket_num}
+in file {self._file.file_path}"""
             )
 
     @property
@@ -2495,19 +2457,14 @@ in file {}""".format(
             interpretation.awkward_form(self.file)
         except uproot.interpretation.objects.CannotBeAwkward as err:
             raise ValueError(
-                """cannot produce Awkward Arrays for interpretation {} because
+                f"""cannot produce Awkward Arrays for interpretation {interpretation!r} because
 
-    {}
+    {err.because}
 
 instead, try library="np" rather than library="ak" or globally set uproot.default_library
 
-in file {}
-in object {}""".format(
-                    repr(interpretation),
-                    err.because,
-                    self.file.file_path,
-                    self.object_path,
-                )
+in file {self.file.file_path}
+in object {self.object_path}"""
             ) from err
 
     def debug(
@@ -2751,10 +2708,7 @@ def _regularize_branchname(
         ):
             raise ValueError(
                 "a branch cannot be loaded with multiple interpretations: "
-                "{} and {}".format(
-                    repr(branchid_interpretation[branch.cache_key]),
-                    repr(interpretation),
-                )
+                f"{branchid_interpretation[branch.cache_key]!r} and {interpretation!r}"
             )
     else:
         branchid_interpretation[branch.cache_key] = interpretation
@@ -3053,8 +3007,10 @@ def _ranges_or_baskets_to_arrays(
             )
 
         # check for CannotBeAwkward errors on the main thread before reading any data
-        if isinstance(library, uproot.interpretation.library.Awkward) and isinstance(
-            interpretation, uproot.interpretation.objects.AsObjects
+        if (
+            isinstance(library, uproot.interpretation.library.Awkward)
+            and isinstance(interpretation, uproot.interpretation.objects.AsObjects)
+            and cache_key in branchid_to_branch
         ):
             branchid_to_branch[cache_key]._awkward_check(interpretation)
 
@@ -3107,16 +3063,9 @@ def _ranges_or_baskets_to_arrays(
             )
             if basket.num_entries != len(basket_arrays[basket.basket_num]):
                 raise ValueError(
-                    """basket {} in tree/branch {} has the wrong number of entries """
-                    """(expected {}, obtained {}) when interpreted as {}
-    in file {}""".format(
-                        basket.basket_num,
-                        branch.object_path,
-                        basket.num_entries,
-                        len(basket_arrays[basket.basket_num]),
-                        interpretation,
-                        branch.file.file_path,
-                    )
+                    f"""basket {basket.basket_num} in tree/branch {branch.object_path} has the wrong number of entries """
+                    f"""(expected {basket.num_entries}, obtained {len(basket_arrays[basket.basket_num])}) when interpreted as {interpretation}
+    in file {branch.file.file_path}"""
                 )
 
             basket = None

{uproot-5.3.2rc1 → uproot-5.3.4}/src/uproot/behaviors/TTree.py

@@ -29,9 +29,7 @@ class TTree(uproot.behaviors.TBranch.HasBranches):
         if len(self) == 0:
             return f"<TTree {self.name!r} at 0x{id(self):012x}>"
         else:
-            return "<TTree {} ({} branches) at 0x{:012x}>".format(
-                repr(self.name), len(self), id(self)
-            )
+            return f"<TTree {self.name!r} ({len(self)} branches) at 0x{id(self):012x}>"
 
     @property
     def name(self):

{uproot-5.3.2rc1 → uproot-5.3.4}/src/uproot/compression.py

@@ -434,10 +434,8 @@ def decompress(
             computed_checksum = xxhash.xxh64(data).intdigest()
             if computed_checksum != expected_checksum:
                 raise ValueError(
-                    """computed checksum {} didn't match expected checksum {}
-in file {}""".format(
-                        computed_checksum, expected_checksum, chunk.source.file_path
-                    )
+                    f"""computed checksum {computed_checksum} didn't match expected checksum {expected_checksum}
+in file {chunk.source.file_path}"""
                 )
 
         elif algo == _decompress_ZSTD._2byte:
@@ -468,16 +466,10 @@ in file {chunk.source.file_path}"""
 
         if len(uncompressed_bytestring) != block_uncompressed_bytes:
             raise ValueError(
-                """after successfully decompressing {} blocks, a block of """
-                """compressed size {} decompressed to {} bytes, but the """
-                """block header expects {} bytes.
-in file {}""".format(
-                    num_blocks,
-                    block_compressed_bytes,
-                    len(uncompressed_bytestring),
-                    block_uncompressed_bytes,
-                    chunk.source.file_path,
-                )
+                f"""after successfully decompressing {num_blocks} blocks, a block of """
+                f"""compressed size {block_compressed_bytes} decompressed to {len(uncompressed_bytestring)} bytes, but the """
+                f"""block header expects {block_uncompressed_bytes} bytes.
+in file {chunk.source.file_path}"""
             )
 
         uncompressed_array = numpy.frombuffer(