Carefully merged #710 and #749.

scikit-hep · Oct 28, 2022 · 0d18565 · 0d18565
1 parent 79e9ef9
commit 0d18565
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/src/uproot/containers.py b/src/uproot/containers.py
@@ -76,7 +76,7 @@ def _read_nested(
                 )
             temp = forth_obj.add_node(
                 f"node{key}",
-                helper_obj.get_attrs(),
+                forth_stash.get_attrs(),
                 "i64",
                 1,
                 None,
@@ -543,7 +543,7 @@ def read(self, chunk, cursor, context, file, selffile, parent, header=True):
             forth_stash.add_to_init(f"0 node{offsets_num}-offsets <- stack\n")
             temp_form = forth_obj.add_node(
                 f"node{offsets_num}",
-                helper_obj.get_attrs(),
+                forth_stash.get_attrs(),
                 "i64",
                 0,
                 None,
@@ -781,7 +781,7 @@ def read(self, chunk, cursor, context, file, selffile, parent, header=True):
                             forth_obj.add_form(json.loads(temp_aform))
                     temp = forth_obj.add_node(
                         f"node{offsets_num}",
-                        helper_obj.get_attrs(),
+                        forth_stash.get_attrs(),
                         "i64",
                         1,
                         {},
@@ -859,7 +859,7 @@ def read(self, chunk, cursor, context, file, selffile, parent, header=True):
                             forth_obj.add_form(json.loads(temp_aform))
                     temp = forth_obj.add_node(
                         f"node{offsets_num}",
-                        helper_obj.get_attrs(),
+                        forth_stash.get_attrs(),
                         "i64",
                         1,
                         {},
@@ -1179,7 +1179,7 @@ def read(self, chunk, cursor, context, file, selffile, parent, header=True):
                     forth_stash.add_to_post("loop\n")
                 temp = forth_obj.add_node(
                     f"node{key}",
-                    helper_obj.get_attrs(),
+                    forth_stash.get_attrs(),
                     "i64",
                     1,
                     {},
@@ -1342,7 +1342,7 @@ def read(self, chunk, cursor, context, file, selffile, parent, header=True):
                 forth_stash.add_to_post("loop\n")
             temp = forth_obj.add_node(
                 f"node{key}",
-                helper_obj.get_attrs(),
+                forth_stash.get_attrs(),
                 "i64",
                 1,
                 {},
@@ -1604,7 +1604,7 @@ def read(self, chunk, cursor, context, file, selffile, parent, header=True):
                     forth_obj.add_form(aform)
                 temp = forth_obj.add_node(
                     "nodeMap",
-                    helper_obj.get_attrs(),
+                    forth_stash.get_attrs(),
                     "i64",
                     1,
                     [keys_model["content"], values_model["content"]],

diff --git a/src/uproot/model.py b/src/uproot/model.py
@@ -819,7 +819,7 @@ def read(cls, chunk, cursor, context, file, selffile, parent, concrete=None):
                     if forth_stash is not None:
                         forth_obj.add_node(
                             "pass",
-                            helper_obj.get_attrs(),
+                            forth_stash.get_attrs(),
                             "i64",
                             1,
                             {},
@@ -859,7 +859,7 @@ def read(cls, chunk, cursor, context, file, selffile, parent, concrete=None):
             if forth_stash is not None:
                 forth_obj.add_node(
                     "model828",
-                    helper_obj.get_attrs(),
+                    forth_stash.get_attrs(),
                     "i64",
                     1,
                     {},
@@ -1342,7 +1342,7 @@ def read(cls, chunk, cursor, context, file, selffile, parent, concrete=None):
             forth_stash.add_to_pre(f"{bytes_skipped} stream skip \n")
             forth_obj.add_node(
                 "Model1319",
-                helper_obj.get_attrs(),
+                forth_stash.get_attrs(),
                 "i64",
                 1,
                 {},

diff --git a/src/uproot/models/TDatime.py b/src/uproot/models/TDatime.py
@@ -49,7 +49,7 @@ def read_members(self, chunk, cursor, context, file):
                 forth_obj.add_form(temp_aform)
             temp_form = forth_obj.add_node(
                 f"node{key}",
-                helper_obj.get_attrs(),
+                forth_stash.get_attrs(),
                 "i64",
                 0,
                 None,

diff --git a/src/uproot/models/TObject.py b/src/uproot/models/TObject.py
@@ -57,7 +57,7 @@ def read_members(self, chunk, cursor, context, file):
                 forth_obj.add_form(json.loads(temp_aform))
             forth_obj.add_node(
                 "TObjext",
-                helper_obj.get_attrs(),
+                forth_stash.get_attrs(),
                 "i64",
                 0,
                 {},

diff --git a/src/uproot/models/TRef.py b/src/uproot/models/TRef.py
@@ -167,7 +167,7 @@ def read_members(self, chunk, cursor, context, file):
                 )
             forth_obj.add_node(
                 f"node{form_keys[0]}",
-                helper_obj.get_attrs(),
+                forth_stash.get_attrs(),
                 "i64",
                 1,
                 None,

diff --git a/src/uproot/models/TString.py b/src/uproot/models/TString.py
@@ -70,7 +70,7 @@ def read_members(self, chunk, cursor, context, file):
             forth_stash.add_to_init(f"0 node{offsets_num}-offsets <- stack\n")
             temp_form = forth_obj.add_node(
                 f"node{offsets_num}",
-                helper_obj.get_attrs(),
+                forth_stash.get_attrs(),
                 "i64",
                 0,
                 None,