From 1f44ec7a76f29924061baf3b2d5458a53b64b133 Mon Sep 17 00:00:00 2001 From: Silia Taider Date: Thu, 25 Jun 2026 19:04:26 +0200 Subject: [PATCH 1/2] [Python][CodeQL] Clean up unused loop iteration variables --- bindings/pyroot/pythonizations/test/ttree_iterable.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bindings/pyroot/pythonizations/test/ttree_iterable.py b/bindings/pyroot/pythonizations/test/ttree_iterable.py index 665713c73b483..6dbcebec2afb6 100644 --- a/bindings/pyroot/pythonizations/test/ttree_iterable.py +++ b/bindings/pyroot/pythonizations/test/ttree_iterable.py @@ -71,7 +71,7 @@ def test_basic_type_branch(self): ds.SetBranchAddress('floatb', n) i = 0 - for entry in ds: + for _ in ds: self.assertEqual(n[0], i+self.more) i = (i + 1) % self.nentries @@ -83,7 +83,7 @@ def test_array_branch(self): ds.SetBranchAddress('arrayb', a) i = 0 - for entry in ds: + for _ in ds: for j in range(self.arraysize): self.assertEqual(a[j], i+j) i = (i + 1) % self.nentries @@ -96,7 +96,7 @@ def test_struct_branch(self): ds.SetBranchAddress('structleaflistb', ms) i = 0 - for entry in ds: + for _ in ds: self.assertEqual(ms.myint1, i+self.more) self.assertEqual(ms.myint2, i*self.more) i = (i + 1) % self.nentries @@ -115,7 +115,7 @@ def test_ntuples(self): numentry = 0 - for entry in ds: + for _ in ds: for i in range(ncols): self.assertEqual(cs[i][0], numentry + i*self.more) numentry += 1 From e53bfc8a1f440572feec063ad4a64cb3c6778c0c Mon Sep 17 00:00:00 2001 From: Silia Taider Date: Fri, 26 Jun 2026 11:52:52 +0200 Subject: [PATCH 2/2] [ruff] formaat ttree_iterable.py --- .../pythonizations/test/ttree_iterable.py | 79 ++++++++----------- 1 file changed, 35 insertions(+), 44 deletions(-) diff --git a/bindings/pyroot/pythonizations/test/ttree_iterable.py b/bindings/pyroot/pythonizations/test/ttree_iterable.py index 6dbcebec2afb6..9936af9b7982d 100644 --- a/bindings/pyroot/pythonizations/test/ttree_iterable.py +++ b/bindings/pyroot/pythonizations/test/ttree_iterable.py @@ -6,7 +6,7 @@ class TTreeIterable(unittest.TestCase): """ - Test for the pythonization that makes TTree instances iterable in Python. + Test for the pythonization that makes TTree instances iterable in Python. For example, this allows to do: `for event in mytree:` `...` @@ -15,28 +15,19 @@ class TTreeIterable(unittest.TestCase): and TNtupleD are also tested here. """ - filename = 'treeiterable.root' - treename = 'mytree' - tuplename = 'mytuple' - nentries = 10 + filename = "treeiterable.root" + treename = "mytree" + tuplename = "mytuple" + nentries = 10 arraysize = 10 - more = 10 + more = 10 # Setup @classmethod def setUpClass(cls): - ROOT.gInterpreter.Declare('#include "TreeHelper.h"') - ROOT.CreateTTree(cls.filename, - cls.treename, - cls.nentries, - cls.arraysize, - cls.more, - 'RECREATE') - ROOT.CreateTNtuple(cls.filename, - cls.tuplename, - cls.nentries, - cls.more, - 'UPDATE') + ROOT.gInterpreter.Declare('#include "TreeHelper.h"') + ROOT.CreateTTree(cls.filename, cls.treename, cls.nentries, cls.arraysize, cls.more, "RECREATE") + ROOT.CreateTNtuple(cls.filename, cls.tuplename, cls.nentries, cls.more, "UPDATE") # Helpers def get_tree_and_chain(self): @@ -49,7 +40,7 @@ def get_tree_and_chain(self): c.Add(self.filename) c.Add(self.filename) - return f,t,c + return f, t, c def get_ntuples(self): f = ROOT.TFile(self.filename) @@ -57,69 +48,69 @@ def get_ntuples(self): nt = f.Get(self.tuplename) ROOT.SetOwnership(nt, False) - ntd = f.Get(self.tuplename + 'D') + ntd = f.Get(self.tuplename + "D") ROOT.SetOwnership(ntd, False) - return f,nt,ntd + return f, nt, ntd # Tests def test_basic_type_branch(self): - f,t,c = self.get_tree_and_chain() + f, t, c = self.get_tree_and_chain() - for ds in t,c: - n = array('f', [ 0. ]) - ds.SetBranchAddress('floatb', n) + for ds in t, c: + n = array("f", [0.0]) + ds.SetBranchAddress("floatb", n) i = 0 for _ in ds: - self.assertEqual(n[0], i+self.more) + self.assertEqual(n[0], i + self.more) i = (i + 1) % self.nentries def test_array_branch(self): - f,t,c = self.get_tree_and_chain() + f, t, c = self.get_tree_and_chain() - for ds in t,c: - a = array('d', self.arraysize*[ 0. ]) - ds.SetBranchAddress('arrayb', a) + for ds in t, c: + a = array("d", self.arraysize * [0.0]) + ds.SetBranchAddress("arrayb", a) i = 0 for _ in ds: for j in range(self.arraysize): - self.assertEqual(a[j], i+j) + self.assertEqual(a[j], i + j) i = (i + 1) % self.nentries def test_struct_branch(self): - f,t,c = self.get_tree_and_chain() + f, t, c = self.get_tree_and_chain() - for ds in t,c: + for ds in t, c: ms = ROOT.MyStruct() - ds.SetBranchAddress('structleaflistb', ms) + ds.SetBranchAddress("structleaflistb", ms) i = 0 for _ in ds: - self.assertEqual(ms.myint1, i+self.more) - self.assertEqual(ms.myint2, i*self.more) + self.assertEqual(ms.myint1, i + self.more) + self.assertEqual(ms.myint2, i * self.more) i = (i + 1) % self.nentries def test_ntuples(self): - f,nt,ntd = self.get_ntuples() + f, nt, ntd = self.get_ntuples() - colnames = ['x','y','z'] - cols = [ array('f', [ 0. ]) for _ in colnames ] - colsd = [ array('d', [ 0. ]) for _ in colnames ] + colnames = ["x", "y", "z"] + cols = [array("f", [0.0]) for _ in colnames] + colsd = [array("d", [0.0]) for _ in colnames] ncols = len(cols) - for ds,cs in [(nt,cols),(ntd,colsd)]: + for ds, cs in [(nt, cols), (ntd, colsd)]: for i in range(ncols): ds.SetBranchAddress(colnames[i], cs[i]) numentry = 0 - + for _ in ds: for i in range(ncols): - self.assertEqual(cs[i][0], numentry + i*self.more) + self.assertEqual(cs[i][0], numentry + i * self.more) numentry += 1 -if __name__ == '__main__': +if __name__ == "__main__": unittest.main()