github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

code review: removed unused (unneeded) code, coverage increase...

pull/1750/head
sebres 2017-08-09 15:36:36 +02:00
parent 6f4fde2c29
commit 7549f44ded
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fail2ban/client/configparserinc.py
View File

@ -73,11 +73,6 @@ else: # pragma: no cover
return self._cp_interpolate_some(option, accum, rest, section, map, *args, **kwargs) return self._cp_interpolate_some(option, accum, rest, section, map, *args, **kwargs)
SafeConfigParser._interpolate_some = _interpolate_some SafeConfigParser._interpolate_some = _interpolate_some
try:
from configparser import _UNSET
except ImportError:
_UNSET = object()
# Gets the instance of the logger. # Gets the instance of the logger.
logSys = getLogger(__name__) logSys = getLogger(__name__)
logLevel = 7 logLevel = 7
@ -117,7 +112,6 @@ after = 1.conf
SECTION_NAME = "INCLUDES" SECTION_NAME = "INCLUDES"
SECTION_OPT_CRE = re.compile(r'^([\w\-]+)/(.+)$')
SECTION_OPTSUBST_CRE = re.compile(r'%\(([\w\-]+/([^\)]+))\)s') SECTION_OPTSUBST_CRE = re.compile(r'%\(([\w\-]+/([^\)]+))\)s')
CONDITIONAL_RE = re.compile(r"^(\w+)(\?.+)$") CONDITIONAL_RE = re.compile(r"^(\w+)(\?.+)$")
@ -161,7 +155,7 @@ after = 1.conf
# fallback to default: # fallback to default:
try: try:
v = self._defaults[opt] v = self._defaults[opt]
except KeyError: except KeyError: # pragma: no cover
continue continue
else: else:
# get raw value of opt in section: # get raw value of opt in section:
@ -169,7 +163,7 @@ after = 1.conf
else: else:
try: try:
v = self._defaults[opt] v = self._defaults[opt]
except KeyError: except KeyError: # pragma: no cover
continue continue
self._defaults[sopt] = v self._defaults[sopt] = v
try: # for some python versions need to duplicate it in map-vars also: try: # for some python versions need to duplicate it in map-vars also:
@ -260,18 +254,6 @@ after = 1.conf
def get_sections(self): def get_sections(self):
return self._sections return self._sections
def get(self, sec, opt, raw=False, vars={}, fallback=_UNSET):
try:
return SafeConfigParser.get(self, sec, opt, raw=raw, vars=vars)
except:
sopt = SafeConfigParserWithIncludes.SECTION_OPT_CRE.match(opt)
if not sopt: raise
sec, opt = sopt.groups()
if sec.lower() == 'default':
# get default raw value:
return self._defaults[opt]
return SafeConfigParser.get(self, sec, opt, raw=raw, vars=vars)
def options(self, section, withDefault=True): def options(self, section, withDefault=True):
"""Return a list of option names for the given section name. """Return a list of option names for the given section name.
@ -279,7 +261,7 @@ after = 1.conf
""" """
try: try:
opts = self._sections[section] opts = self._sections[section]
except KeyError: except KeyError: # pragma: no cover
raise NoSectionError(section) raise NoSectionError(section)
if withDefault: if withDefault:
# mix it with defaults: # mix it with defaults: