|
9 | 9 | import string |
10 | 10 | import sys |
11 | 11 | from functools import wraps |
12 | | -from typing import Any, Callable, Dict, List, Tuple, TypeVar, Union |
| 12 | +from typing import Any, Callable, Dict, List, Optional, Tuple, TypeVar, Union |
13 | 13 | from volatility3.cli import text_filter |
14 | 14 |
|
15 | 15 | from volatility3.framework import exceptions, interfaces, renderers |
16 | | -from volatility3.framework.interfaces.renderers import BaseAbsentValue |
17 | 16 | from volatility3.framework.renderers import format_hints |
18 | 17 |
|
19 | 18 | vollog = logging.getLogger(__name__) |
@@ -84,7 +83,9 @@ def multitypedata_as_text(value: format_hints.MultiTypeData) -> str: |
84 | 83 | T = TypeVar("T") |
85 | 84 |
|
86 | 85 |
|
87 | | -def optional(func: Callable[[Union[BaseAbsentValue, T]], str]) -> Callable[[T], str]: |
| 86 | +def optional( |
| 87 | + func: Callable[[Union[interfaces.renderers.BaseAbsentValue, T]], str], |
| 88 | +) -> Callable[[T], str]: |
88 | 89 | @wraps(func) |
89 | 90 | def wrapped(x: Any) -> str: |
90 | 91 | if isinstance(x, interfaces.renderers.BaseAbsentValue): |
@@ -156,8 +157,10 @@ def __init__(self): |
156 | 157 | self.display_hex = True |
157 | 158 | self.display_ascii = True |
158 | 159 |
|
159 | | - def render(data: Union[renderers.LayerData, BaseAbsentValue]): |
160 | | - if isinstance(data, BaseAbsentValue): |
| 160 | + def render( |
| 161 | + data: Union[renderers.LayerData, interfaces.renderers.BaseAbsentValue], |
| 162 | + ): |
| 163 | + if isinstance(data, interfaces.renderers.BaseAbsentValue): |
161 | 164 | # FIXME: Do something cleverer here |
162 | 165 | return "" |
163 | 166 |
|
@@ -241,8 +244,8 @@ class CLIRenderer(interfaces.renderers.Renderer): |
241 | 244 |
|
242 | 245 | name = "unnamed" |
243 | 246 | structured_output = False |
244 | | - filter: text_filter.CLIFilter = None |
245 | | - column_hide_list: list = None |
| 247 | + filter: Optional[text_filter.CLIFilter] = None |
| 248 | + column_hide_list: Optional[list] = None |
246 | 249 |
|
247 | 250 | def ignored_columns( |
248 | 251 | self, |
|
0 commit comments