From 674394cd691e79ffd79b41155daa51a992112010 Mon Sep 17 00:00:00 2001 From: Mike Auty Date: Thu, 8 Mar 2018 01:20:55 +0000 Subject: [PATCH] Fix up TreeGrid typing information in places. --- volatility/framework/interfaces/renderers.py | 6 +++--- volatility/framework/renderers/__init__.py | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/volatility/framework/interfaces/renderers.py b/volatility/framework/interfaces/renderers.py index 533f6eac0..31deeb0f4 100644 --- a/volatility/framework/interfaces/renderers.py +++ b/volatility/framework/interfaces/renderers.py @@ -130,9 +130,9 @@ class TreeGrid(object, metaclass = ABCMeta): @abstractmethod def populate(self, func: VisitorSignature = None, - initial_accumulator: typing.Any = None) \ - -> typing.Generator[typing.Tuple[SimpleTypes, ...], None, None]: - """Generator that returns the next available Node + initial_accumulator: typing.Any = None) -> None: + """Populates the tree by consuming the TreeGrid's construction generator + Func is called on every node, so can be used to create output on demand This is equivalent to a one-time visit. """ diff --git a/volatility/framework/renderers/__init__.py b/volatility/framework/renderers/__init__.py index 27fddc75a..09e14eb9f 100644 --- a/volatility/framework/renderers/__init__.py +++ b/volatility/framework/renderers/__init__.py @@ -168,8 +168,7 @@ class TreeGrid(interfaces.renderers.TreeGrid): def populate(self, func: interfaces.renderers.VisitorSignature = None, - initial_accumulator: typing.Any = None) \ - -> typing.Generator[typing.Tuple[interfaces.renderers.SimpleTypes, ...], None, None]: + initial_accumulator: typing.Any = None) -> None: """Populates the tree by consuming the TreeGrid's construction generator Func is called on every node, so can be used to create output on demand @@ -190,7 +189,6 @@ class TreeGrid(interfaces.renderers.TreeGrid): accumulator = func(treenode, accumulator) self._row_count += 1 self._populated = True - return None @property def populated(self): @@ -263,7 +261,7 @@ class TreeGrid(interfaces.renderers.TreeGrid): _T = typing.TypeVar("_T") def visit(self, - node: interfaces.renderers.TreeNode, + node: typing.Optional[interfaces.renderers.TreeNode], function: typing.Callable[[interfaces.renderers.TreeNode, _T], _T], initial_accumulator: _T = None, sort_key: interfaces.renderers.ColumnSortKey = None):