diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | fail2ban/server/failregex.py | 3 |
4 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 1a0de9af..ea84432e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ python: - "2.7" - "3.2" - "3.3" + - "pypy" before_install: - sudo apt-get update -qq install: @@ -63,6 +63,7 @@ code-review and minor additions from Yaroslav Halchenko. support these. ISO8601 now defaults to localtime unless specified otherwise. Some filters have been change as required to capture these elements in the right timezone correctly. + * Support PyPy ver. 0.8.12 (2013/12/XX) - things-can-only-get-better ----------- @@ -21,7 +21,7 @@ Installation: this case, you should use it instead.** Required: -- [Python2 >= 2.4 or Python3 >= 3.2](http://www.python.org) +- [Python2 >= 2.4 or Python3 >= 3.2](http://www.python.org) or [PyPy](http://pypy.org) Optional: - [pyinotify >= 0.8.3](https://github.com/seb-m/pyinotify) diff --git a/fail2ban/server/failregex.py b/fail2ban/server/failregex.py index d5732c80..60ea5cfd 100644 --- a/fail2ban/server/failregex.py +++ b/fail2ban/server/failregex.py @@ -136,7 +136,8 @@ class Regex: if self._matchCache.group("skiplines%i" % n) is not None: skippedLines += self._matchCache.group("skiplines%i" % n) n += 1 - except IndexError: + # KeyError is because of PyPy + except (IndexError, KeyError): break return skippedLines.splitlines(False) |