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

ENH: error handling on re.group KeyError exception only for PyPy

pull/520/head
Daniel Black 2013-12-27 20:01:43 +00:00
parent 1f1fe254a6
commit 18fbfed91f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fail2ban/server/failregex.py
View File

@ -21,7 +21,7 @@ __author__ = "Cyril Jaquier"
__copyright__ = "Copyright (c) 2004 Cyril Jaquier" __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
__license__ = "GPL" __license__ = "GPL"
import re, sre_constants import re, sre_constants, sys
## ##
# Regular expression class. # Regular expression class.
@ -136,8 +136,12 @@ class Regex:
if self._matchCache.group("skiplines%i" % n) is not None: if self._matchCache.group("skiplines%i" % n) is not None:
skippedLines += self._matchCache.group("skiplines%i" % n) skippedLines += self._matchCache.group("skiplines%i" % n)
n += 1 n += 1
except IndexError:
break
# KeyError is because of PyPy issue1665 affecting pypy <= 2.2.1 # KeyError is because of PyPy issue1665 affecting pypy <= 2.2.1
except (IndexError, KeyError): except KeyError:
if 'PyPy' not in sys.version: # pragma: no cover - not sure this is even reachable
raise
break break
return skippedLines.splitlines(False) return skippedLines.splitlines(False)