ENH: Renamed OptionConfigReader to DefinitionInitConfigReader

fail2ban/client/actionreader.py

@@ -28,12 +28,12 @@ __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"
 
 import logging, os
-from configreader import ConfigReader, OptionConfigReader
+from configreader import ConfigReader, DefinitionInitConfigReader
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)
 
-class ActionReader(OptionConfigReader):
+class ActionReader(DefinitionInitConfigReader):
 
 	_configOpts = [
 		["string", "actionstart", ""],

fail2ban/client/configreader.py

@@ -131,7 +131,14 @@ class ConfigReader(SafeConfigParserWithIncludes):
 				values[option[1]] = option[2]
 		return values
 
-class OptionConfigReader(ConfigReader):
+class DefinitionInitConfigReader(ConfigReader):
+	"""Config reader for files with options grouped in [Definition] and
+       [Init] sections.
+
+       Is a base class for readers of filters and actions, where definitions
+       in jails might provide custom values for options defined in [Init]
+       section.
+       """
 
 	_configOpts = []
 	

fail2ban/client/filterreader.py

@@ -28,12 +28,12 @@ __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"
 
 import logging, os
-from configreader import ConfigReader, OptionConfigReader
+from configreader import ConfigReader, DefinitionInitConfigReader
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)
 
-class FilterReader(OptionConfigReader):
+class FilterReader(DefinitionInitConfigReader):
 
 	_configOpts = [
 		["string", "ignoreregex", ""],