Apparently, it wasn't in 3.5, but it throws type-checking errors

Python3.6 introduced it, but annoying the type-checker realizes that
we're using it like any int (ie, A | B) and throws a wobbly.  Really
want to see the back of python3.5...

Revert "IntFlag is in python-3.5 by default, it's just if the enum34 package is installed that problems happen."

This reverts commit 17a0e1eac8.
This commit is contained in:
Mike Auty
2019-06-28 15:31:59 +01:00
parent 17a0e1eac8
commit ef28a9b733
@@ -35,7 +35,8 @@ from volatility.framework.symbols.windows import extensions
vollog = logging.getLogger(__name__)
class PoolType(enum.IntFlag):
# TODO: When python3.5 is no longer supported, make this enum.IntFlag
class PoolType(enum.IntEnum):
"""Class to maintain the different possible PoolTypes
The values must be integer powers of 2"""
@@ -259,9 +260,9 @@ class PoolScanner(plugins.PluginInterface):
# registry hives
PoolConstraint(
b'CM10',
type_name = symbol_table + constants.BANG + "_CMHIVE",
size = (800, None),
page_type = PoolType.PAGED | PoolType.NONPAGED | PoolType.FREE),
type_name=symbol_table + constants.BANG + "_CMHIVE",
size=(800, None),
page_type=PoolType.PAGED | PoolType.NONPAGED | PoolType.FREE),
]
if not tags_filter: