Skip to content

Commit

Permalink
style: pre-commit fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pre-commit-ci[bot] committed Feb 5, 2025
1 parent 97daf4b commit f1271cc
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 9 deletions.
18 changes: 14 additions & 4 deletions src/uproot/_dask.py
Original file line number Diff line number Diff line change
Expand Up @@ -1392,8 +1392,10 @@ def _get_ttree_form(
content_form = branch.interpretation.awkward_form(ttree.file)
if ak_add_doc or ak_add_typename:
content_parameters = {}
if ak_add_doc : content_parameters["__doc__"] = branch.title
if ak_add_typename : content_parameters["typename"] = branch.typename
if ak_add_doc:
content_parameters["__doc__"] = branch.title
if ak_add_typename:
content_parameters["typename"] = branch.typename
content_form = content_form.copy(parameters=content_parameters)
contents.append(content_form)

Expand Down Expand Up @@ -1550,7 +1552,11 @@ def real_filter_branch(branch):
partition_args.append((i, start, stop))

base_form = _get_ttree_form(
awkward, ttrees[0], common_keys, interp_options.get("ak_add_doc"), interp_options.get("ak_add_typename")
awkward,
ttrees[0],
common_keys,
interp_options.get("ak_add_doc"),
interp_options.get("ak_add_typename"),
)

if len(partition_args) == 0:
Expand Down Expand Up @@ -1624,7 +1630,11 @@ def _get_dak_array_delay_open(
ignore_duplicates=True,
)
base_form = _get_ttree_form(
awkward, obj, common_keys, interp_options.get("ak_add_doc"), interp_options.get("ak_add_typename")
awkward,
obj,
common_keys,
interp_options.get("ak_add_doc"),
interp_options.get("ak_add_typename"),
)

divisions = [0]
Expand Down
26 changes: 21 additions & 5 deletions src/uproot/behaviors/TBranch.py
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,7 @@ def _ak_add_doc_typename(array, hasbranches, ak_add_doc, ak_add_typename):
array.layout.parameters["typename"] = hasbranches.typename
return array


class HasBranches(Mapping):
"""
Abstract class of behaviors for anything that "has branches," namely
Expand Down Expand Up @@ -898,7 +899,10 @@ def get_from_cache(branchname, interpretation):
]

return _ak_add_doc_typename(
library.group(output, expression_context, how), self, ak_add_doc, ak_add_typename
library.group(output, expression_context, how),
self,
ak_add_doc,
ak_add_typename,
)

def iterate(
Expand Down Expand Up @@ -1085,7 +1089,10 @@ def iterate(
)

arrays = {}
interp_options = {"ak_add_doc": ak_add_doc, "ak_add_typename": ak_add_typename}
interp_options = {
"ak_add_doc": ak_add_doc,
"ak_add_typename": ak_add_typename,
}
_ranges_or_baskets_to_arrays(
self,
ranges_or_baskets,
Expand All @@ -1107,7 +1114,7 @@ def iterate(
library,
how,
ak_add_doc,
ak_add_typename
ak_add_typename,
)

output = language.compute_expressions(
Expand Down Expand Up @@ -3162,7 +3169,13 @@ def basket_to_array(basket):


def _fix_asgrouped(
arrays, expression_context, branchid_interpretation, library, how, ak_add_doc, ak_add_typename
arrays,
expression_context,
branchid_interpretation,
library,
how,
ak_add_doc,
ak_add_typename,
):
index_start = 0
for index_stop, (_, context) in enumerate(expression_context):
Expand All @@ -3182,7 +3195,10 @@ def _fix_asgrouped(
subcontext.append((subname, limited_context[subname]))

arrays[branch.cache_key] = _ak_add_doc_typename(
library.group(subarrays, subcontext, how), branch, ak_add_doc, ak_add_typename
library.group(subarrays, subcontext, how),
branch,
ak_add_doc,
ak_add_typename,
)

index_start = index_stop
Expand Down

0 comments on commit f1271cc

Please sign in to comment.