Merge pull request #220 from kwirk/0.9_tweaks

0.9 tweaks. file moves after the merge and exception catching
2013-05-09 16:14:05 -07:00 · 2013-05-09 16:14:05 -07:00 · ded87bad9a
parent 709b437b7d b7912446ef
commit ded87bad9a
5 changed files with 1 additions and 1 deletions
--- a/bin/fail2ban-regex
+++ b/bin/fail2ban-regex
@ -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:
--- a/fail2ban/tests/files/logs/assp
+++ b/fail2ban/tests/files/logs/assp
--- a/fail2ban/tests/files/logs/bsd/syslog-plain.txt
+++ b/fail2ban/tests/files/logs/bsd/syslog-plain.txt
--- a/fail2ban/tests/files/logs/bsd/syslog-v.txt
+++ b/fail2ban/tests/files/logs/bsd/syslog-v.txt
--- a/fail2ban/tests/files/logs/bsd/syslog-vv.txt
+++ b/fail2ban/tests/files/logs/bsd/syslog-vv.txt