From e57505e0740aa1d3f49ba8b9c9b52a0bb45d74bc Mon Sep 17 00:00:00 2001
From: Steven Hiscocks <steven@hiscocks.me.uk>
Date: Sun, 21 Apr 2013 11:27:32 +0100
Subject: [PATCH] ENH: Renamed OptionConfigReader to DefinitionInitConfigReader

---
 fail2ban/client/actionreader.py | 4 ++--
 fail2ban/client/configreader.py | 9 ++++++++-
 fail2ban/client/filterreader.py | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/fail2ban/client/actionreader.py b/fail2ban/client/actionreader.py
index 70c5b3a7..ca4080d0 100644
--- a/fail2ban/client/actionreader.py
+++ b/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", ""],
diff --git a/fail2ban/client/configreader.py b/fail2ban/client/configreader.py
index 4cb9cd69..45ea1361 100644
--- a/fail2ban/client/configreader.py
+++ b/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 = []
 	
diff --git a/fail2ban/client/filterreader.py b/fail2ban/client/filterreader.py
index 19a3f0f3..62424ddb 100644
--- a/fail2ban/client/filterreader.py
+++ b/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", ""],