Merge remote-tracking branch 'origin/0.9' into 0.9

* origin/0.9:
  TST: Move test files to correct folder for 0.9 branch
  BF: fail2ban-regex fix for maxlines init option reader
pull/224/merge
Yaroslav Halchenko 2013-05-13 16:38:39 -04:00
commit 6a380139bd
1 changed files with 1 additions and 1 deletions

View File

@ -213,7 +213,7 @@ class Fail2banRegex:
# Read out and set possible value of maxlines
try:
maxlines = reader.get("Init", "maxlines")
except NoSectionError, NoOptionError:
except (NoSectionError, NoOptionError):
# No [Init].maxlines found.
pass
else: