Skip to content

Commit c18818a

Browse files
committed
Fix misuse of all() and any() functions across the codebase
1 parent 72abb41 commit c18818a

File tree

12 files changed

+31
-51
lines changed

12 files changed

+31
-51
lines changed

volatility3/cli/text_filter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def filter(
5353
"""Filters the row based on each of the column_filters"""
5454
if not self._filters:
5555
return False
56-
found = any([column_filter.found(row) for column_filter in self._filters])
56+
found = any(column_filter.found(row) for column_filter in self._filters)
5757
return not found
5858

5959

@@ -86,7 +86,7 @@ def found(self, row: List[Any]) -> bool:
8686
otherwise it is filtered.
8787
"""
8888
if self.column_num is None:
89-
found = any([self.find(x) for x in row])
89+
found = any(self.find(x) for x in row)
9090
else:
9191
found = self.find(row[self.column_num])
9292
if self.exclude:

volatility3/cli/volshell/generic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ def create_configurable(
529529
val, interfaces.configuration.BasicTypes
530530
) and not isinstance(val, list):
531531
if not isinstance(val, list) or all(
532-
[isinstance(x, interfaces.configuration.BasicTypes) for x in val]
532+
isinstance(x, interfaces.configuration.BasicTypes) for x in val
533533
):
534534
raise TypeError(
535535
"Configurable values must be simple types (int, bool, str, bytes)"

volatility3/framework/automagic/pdbscan.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,8 @@ def test_physical_kernel(
209209
try:
210210
kvp = vlayer.mapping(kvo, 0)
211211
if any(
212-
[
213-
(p == kernel["mz_offset"] and layer_name == physical_layer_name)
214-
for (_, _, p, _, layer_name) in kvp
215-
]
212+
(p == kernel["mz_offset"] and layer_name == physical_layer_name)
213+
for (_, _, p, _, layer_name) in kvp
216214
):
217215
return (virtual_layer_name, kvo, kernel)
218216
else:

volatility3/framework/configuration/requirements.py

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def unsatisfied(
161161
"TypeError - Too many values provided to list option.",
162162
)
163163
return {config_path: self}
164-
if not all([isinstance(element, self.element_type) for element in value]):
164+
if not all(isinstance(element, self.element_type) for element in value):
165165
vollog.log(
166166
constants.LOGLEVEL_V,
167167
"TypeError - At least one element in the list is not of the correct type.",
@@ -181,7 +181,7 @@ def __init__(self, choices: List[str], *args, **kwargs) -> None:
181181
"""
182182
super().__init__(*args, **kwargs)
183183
if not isinstance(choices, list) or any(
184-
[not isinstance(choice, str) for choice in choices]
184+
not isinstance(choice, str) for choice in choices
185185
):
186186
raise TypeError("ChoiceRequirement takes a list of strings as choices")
187187
self.choices = choices
@@ -410,11 +410,9 @@ def construct(
410410
args = {"context": context, "config_path": config_path, "name": name}
411411

412412
if any(
413-
[
414-
subreq.unsatisfied(context, config_path)
415-
for subreq in self.requirements.values()
416-
if not subreq.optional
417-
]
413+
subreq.unsatisfied(context, config_path)
414+
for subreq in self.requirements.values()
415+
if not subreq.optional
418416
):
419417
return None
420418

@@ -485,11 +483,9 @@ def construct(
485483
args = {"context": context, "config_path": config_path, "name": name}
486484

487485
if any(
488-
[
489-
subreq.unsatisfied(context, config_path)
490-
for subreq in self.requirements.values()
491-
if not subreq.optional
492-
]
486+
subreq.unsatisfied(context, config_path)
487+
for subreq in self.requirements.values()
488+
if not subreq.optional
493489
):
494490
return None
495491

@@ -710,11 +706,9 @@ def construct(
710706
args = {"context": context, "config_path": config_path, "name": name}
711707

712708
if any(
713-
[
714-
subreq.unsatisfied(context, config_path)
715-
for subreq in self.requirements.values()
716-
if not subreq.optional
717-
]
709+
subreq.unsatisfied(context, config_path)
710+
for subreq in self.requirements.values()
711+
if not subreq.optional
718712
):
719713
return None
720714

volatility3/framework/interfaces/objects.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def has_valid_members(self, member_names: List[str]) -> bool:
216216
Args:
217217
member_names: List of names to test as to members with those names validity
218218
"""
219-
return all([self.has_valid_member(member_name) for member_name in member_names])
219+
return all(self.has_valid_member(member_name) for member_name in member_names)
220220

221221
class VolTemplateProxy(metaclass=abc.ABCMeta):
222222
"""A container for proxied methods that the ObjectTemplate of this

volatility3/framework/layers/intel.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,8 @@ def is_valid(self, offset: int, length: int = 1) -> bool:
270270
try:
271271
# TODO: Consider reimplementing this, since calls to mapping can call is_valid
272272
return all(
273-
[
274-
self._context.layers[layer].is_valid(mapped_offset)
275-
for _, _, mapped_offset, _, layer in self.mapping(offset, length)
276-
]
273+
self._context.layers[layer].is_valid(mapped_offset)
274+
for _, _, mapped_offset, _, layer in self.mapping(offset, length)
277275
)
278276
except exceptions.InvalidAddressException:
279277
return False

volatility3/framework/layers/registry.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,8 @@ def is_valid(self, offset: int, length: int = 1) -> bool:
318318
with contextlib.suppress(exceptions.InvalidAddressException):
319319
# Pass this to the lower layers for now
320320
return all(
321-
[
322-
self.context.layers[layer].is_valid(offset, length)
323-
for (_, _, offset, length, layer) in self.mapping(offset, length)
324-
]
321+
self.context.layers[layer].is_valid(offset, length)
322+
for (_, _, offset, length, layer) in self.mapping(offset, length)
325323
)
326324
return False
327325

volatility3/framework/layers/segmented.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,8 @@ def is_valid(self, offset: int, length: int = 1) -> bool:
5151
try:
5252
base_layer = self._context.layers[self._base_layer]
5353
return all(
54-
[
55-
base_layer.is_valid(mapped_offset)
56-
for _i, _i, mapped_offset, _i, _s in self.mapping(offset, length)
57-
]
54+
base_layer.is_valid(mapped_offset)
55+
for _i, _i, mapped_offset, _i, _s in self.mapping(offset, length)
5856
)
5957
except exceptions.InvalidAddressException:
6058
return False

volatility3/framework/objects/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -928,10 +928,8 @@ def _check_members(
928928
members, collections.abc.Mapping
929929
), f"{agg_name} members parameter must be a mapping: {type(members)}"
930930
assert all(
931-
[
932-
(isinstance(member, tuple) and len(member) == 2)
933-
for member in members.values()
934-
]
931+
(isinstance(member, tuple) and len(member) == 2)
932+
for member in members.values()
935933
), f"{agg_name} members must be a tuple of relative_offsets and templates"
936934

937935
def member(self, attr: str = "member") -> object:

volatility3/framework/plugins/linux/check_afinfo.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ def _check_members(self, var_ops, var_name, members):
5353
def _check_afinfo(self, var_name, var, op_members, seq_members):
5454
# check if object has a least one of the members used for analysis by this function
5555
required_members = ["seq_fops", "seq_ops", "seq_show"]
56-
has_required_member = any(
57-
[var.has_member(member) for member in required_members]
58-
)
56+
has_required_member = any(var.has_member(member) for member in required_members)
5957
if not has_required_member:
6058
vollog.debug(
6159
f"{var_name} object at {hex(var.vol.offset)} had none of the required members: {', '.join([member for member in required_members])}"

0 commit comments

Comments
 (0)