From 366269deb2e6a72ac0a2e286018bcaa5e29863bb Mon Sep 17 00:00:00 2001
From: Mike Auty <mike.auty@gmail.com>
Date: Thu, 9 Aug 2018 13:55:16 +0100
Subject: [PATCH] Refactor Module in interfaces to ModuleInterface.

---
 volatility/framework/contexts/__init__.py  | 4 ++--
 volatility/framework/interfaces/context.py | 4 ++--
 volatility/plugins/windows/verinfo.py      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/volatility/framework/contexts/__init__.py b/volatility/framework/contexts/__init__.py
index 97a5e229b..fef1bf15d 100644
--- a/volatility/framework/contexts/__init__.py
+++ b/volatility/framework/contexts/__init__.py
@@ -104,7 +104,7 @@ class Context(interfaces.context.ContextInterface):
     def module(self,  # type: ignore # FIXME: mypy #5107
                module_name: str,
                layer_name: str,
-               offset: int) -> interfaces.context.Module:
+               offset: int) -> interfaces.context.ModuleInterface:
         """Creates a module object"""
         return Module(self, module_name, layer_name, offset)
 
@@ -121,7 +121,7 @@ def get_module_wrapper(method: str) -> typing.Callable:
     return wrapper
 
 
-class Module(interfaces.context.Module):
+class Module(interfaces.context.ModuleInterface):
     def object(self,
                symbol_name: typing.Optional[str] = None,
                type_name: typing.Optional[str] = None,
diff --git a/volatility/framework/interfaces/context.py b/volatility/framework/interfaces/context.py
index 832a1e8bb..062c246d7 100644
--- a/volatility/framework/interfaces/context.py
+++ b/volatility/framework/interfaces/context.py
@@ -79,11 +79,11 @@ class ContextInterface(object, metaclass = ABCMeta):
     def module(self,
                module_name: str,
                layer_name: str,
-               offset: int) -> 'Module':
+               offset: int) -> 'ModuleInterface':
         """Create a module object """
 
 
-class Module(validity.ValidityRoutines, metaclass = ABCMeta):
+class ModuleInterface(validity.ValidityRoutines, metaclass = ABCMeta):
     """Maintains state concerning a particular loaded module in memory
 
     This object is OS-independent.
diff --git a/volatility/plugins/windows/verinfo.py b/volatility/plugins/windows/verinfo.py
index 7bf41c233..7bc43aef3 100644
--- a/volatility/plugins/windows/verinfo.py
+++ b/volatility/plugins/windows/verinfo.py
@@ -88,7 +88,7 @@ class VerInfo(interfaces_plugins.PluginInterface):
 
     def _generator(self,
                    procs: typing.Generator[interfaces.objects.ObjectInterface, None, None],
-                   mods: typing.Generator[interfaces.context.Module, None, None],
+                   mods: typing.Generator[interfaces.context.ModuleInterface, None, None],
                    moddump_plugin: moddump.ModDump):
         """Generates a list of PE file version info for processes, dlls, and modules.