From 8e1602c02e07a15ada6a2f7f5cd641afc597d053 Mon Sep 17 00:00:00 2001 From: Mike Auty Date: Fri, 15 Jan 2016 01:53:08 +0000 Subject: [PATCH] Refactor constrained to constraint. --- volatility/framework/configuration/__init__.py | 8 ++++---- volatility/framework/interfaces/configuration.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/volatility/framework/configuration/__init__.py b/volatility/framework/configuration/__init__.py index 3dd932cc0..e234ce96b 100644 --- a/volatility/framework/configuration/__init__.py +++ b/volatility/framework/configuration/__init__.py @@ -24,7 +24,7 @@ class StringRequirement(InstanceRequirement): instance_type = str -class TranslationLayerRequirement(config_interface.RequirementInterface, config_interface.ConstrainedInterface): +class TranslationLayerRequirement(config_interface.RequirementInterface, config_interface.ConstraintInterface): """Class maintaining the limitations on what sort of address spaces are acceptable""" def __init__(self, name, description = None, default = None, @@ -38,7 +38,7 @@ class TranslationLayerRequirement(config_interface.RequirementInterface, config_ :return: """ config_interface.RequirementInterface.__init__(self, name, description, default, optional) - config_interface.ConstrainedInterface.__init__(self, constraints) + config_interface.ConstraintInterface.__init__(self, constraints) self._layer_name = layer_name # TODO: Add requirements: acceptable OSes from the address_space information @@ -52,12 +52,12 @@ class TranslationLayerRequirement(config_interface.RequirementInterface, config_ raise IndexError((value or "") + " is not a memory layer") -class SymbolRequirement(config_interface.RequirementInterface, config_interface.ConstrainedInterface): +class SymbolRequirement(config_interface.RequirementInterface, config_interface.ConstraintInterface): """Class maintaining the limitations on what sort of symbol spaces are acceptable""" def __init__(self, name, description = None, default = None, optional = False, constraints = None): config_interface.RequirementInterface.__init__(self, name, description, default, optional) - config_interface.ConstrainedInterface.__init__(self, constraints) + config_interface.ConstraintInterface.__init__(self, constraints) class ChoiceRequirement(config_interface.RequirementInterface): diff --git a/volatility/framework/interfaces/configuration.py b/volatility/framework/interfaces/configuration.py index 80db224cc..80ffb44c0 100644 --- a/volatility/framework/interfaces/configuration.py +++ b/volatility/framework/interfaces/configuration.py @@ -202,7 +202,7 @@ class RequirementTreeNode(RequirementTreeLeaf): return "" -class ConstrainedInterface(validity.ValidityRoutines): +class ConstraintInterface(validity.ValidityRoutines): """Class that specifies capabiltiies that must be provided to succeed""" def __init__(self, constraints = None):