From d28e573c18cb6cd8508a2867fcfbba9bf0f7268c Mon Sep 17 00:00:00 2001 From: Mike Auty Date: Sat, 27 Jun 2020 18:34:43 +0100 Subject: [PATCH] Renderers: Fix python deprecation warnings --- volatility/framework/interfaces/renderers.py | 4 ++-- volatility/framework/renderers/__init__.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/volatility/framework/interfaces/renderers.py b/volatility/framework/interfaces/renderers.py index 55984d11f..dab9dec07 100644 --- a/volatility/framework/interfaces/renderers.py +++ b/volatility/framework/interfaces/renderers.py @@ -9,9 +9,9 @@ renderer interface which can interact with a TreeGrid to produce suitable output. """ -import collections import datetime from abc import abstractmethod, ABCMeta +from collections import abc from typing import Any, Callable, ClassVar, Generator, Iterable, List, NamedTuple, Optional, TypeVar, Type, Tuple, Union Column = NamedTuple('Column', [('name', str), ('type', Any)]) @@ -46,7 +46,7 @@ class ColumnSortKey(metaclass = ABCMeta): function.""" -class TreeNode(collections.Sequence, metaclass = ABCMeta): +class TreeNode(abc.Sequence, metaclass = ABCMeta): def __init__(self, path, treegrid, parent, values): """Initializes the TreeNode.""" diff --git a/volatility/framework/renderers/__init__.py b/volatility/framework/renderers/__init__.py index 94afc8ea1..9c38f5e92 100644 --- a/volatility/framework/renderers/__init__.py +++ b/volatility/framework/renderers/__init__.py @@ -9,6 +9,7 @@ or file or graphical output import collections import datetime import logging +from collections import abc from typing import Any, Callable, Iterable, List, Optional, Tuple, TypeVar, Union from volatility.framework import interfaces @@ -70,7 +71,7 @@ class TreeNode(interfaces.renderers.TreeNode): def _validate_values(self, values: List[interfaces.renderers.BaseTypes]) -> None: """A function for raising exceptions if a given set of values is invalid according to the column properties.""" - if not (isinstance(values, collections.Sequence) and len(values) == len(self._treegrid.columns)): + if not (isinstance(values, abc.Sequence) and len(values) == len(self._treegrid.columns)): raise TypeError( "Values must be a list of objects made up of simple types and number the same as the columns") for index in range(len(self._treegrid.columns)):