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
fail2ban · May 13, 2013 · 6a38013 · 6a38013
2 parents c21b7c3 + ded87ba
commit 6a38013
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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: