Renamed modules/configuration to modules/general

src/binwalk/core/module.py

@@ -136,33 +136,28 @@ class Module(object):
 	# A list of binwalk.core.module.ModuleKwargs accepted by __init__
 	KWARGS = []
 
-	# A dictionary of module dependencies; all modules depend on binwalk.modules.configuration.Configuration
-	#DEPENDS = {'config' : 'Configuration', 'extractor' : 'Extractor'}
+	# A dictionary of module dependencies; all modules depend on binwalk.modules.general.General
 	DEPENDS = [
-			Dependency(name='Configuration',
+			Dependency(name='General',
 					   attribute='config'),
 			Dependency(name='Extractor',
 					   attribute='extractor'),
 	]
 
 	# Format string for printing the header during a scan
-	#HEADER_FORMAT = "%s\n"
 	HEADER_FORMAT = "%-12s  %-12s    %s\n"
 
 	# Format string for printing each result during a scan 
-	#RESULT_FORMAT = "%.8d      %s\n"
 	RESULT_FORMAT = "%-12d  0x%-12X  %s\n"
 
 	# The header to print during a scan.
 	# Set to None to not print a header.
 	# Note that this will be formatted per the HEADER_FORMAT format string.
-	#HEADER = ["OFFSET      DESCRIPTION"]
 	HEADER = ["DECIMAL", "HEX", "DESCRIPTION"]
 
 	# The attribute names to print during a scan, as provided to the self.results method.
 	# Set to None to not print any results.
 	# Note that these will be formatted per the RESULT_FORMAT format string.
-	#RESULT = ['offset', 'description']
 	RESULT = ["offset", "offset", "description"]
 
 	VERBOSE_HEADER_FORMAT = ""

src/binwalk/modules/__init__.py

@@ -2,7 +2,7 @@ from binwalk.modules.signature import Signature
 from binwalk.modules.binvis import Plotter
 from binwalk.modules.hexdiff import HexDiff
 from binwalk.modules.hashmatch import HashMatch
-from binwalk.modules.configuration import Configuration
+from binwalk.modules.general import General
 from binwalk.modules.extractor import Extractor
 from binwalk.modules.entropy import Entropy
 from binwalk.modules.heuristics import HeuristicCompressionAnalyzer

src/binwalk/modules/configuration.py → src/binwalk/modules/general.py

@@ -8,7 +8,7 @@ import binwalk.core.settings
 from binwalk.core.compat import *
 from binwalk.core.module import Module, Option, Kwarg, show_help
 
-class Configuration(Module):
+class General(Module):
 
 	TITLE = "General"
 	ORDER = 0

src/binwalk/modules/heuristics.py

@@ -88,7 +88,7 @@ class HeuristicCompressionAnalyzer(Module):
 	TITLE = "Heuristic Compression"
 
 	DEPENDS = [
-			Dependency(name='Configuration',
+			Dependency(name='General',
 					   attribute='config'),
 			Dependency(name='Entropy',
 					   attribute='entropy',