Merge pull request #1093 from leeclemens/pep8-e7

Fix PEP8 E701, E703 and E712

fail2ban/server/actions.py

@@ -296,7 +296,7 @@ class Actions(JailThread, Mapping):
 			True if an IP address get banned.
 		"""
 		ticket = self._jail.getFailTicket()
-		if ticket != False:
+		if ticket:
 			aInfo = CallingMap()
 			bTicket = BanManager.createBanTicket(ticket)
 			ip = bTicket.getIP()

fail2ban/tests/databasetestcase.py

@@ -306,7 +306,7 @@ class DatabaseTest(LogCaptureTestCase):
 	def testActionWithDB(self):
 		# test action together with database functionality
 		self.testAddJail() # Jail required
-		self.jail.database = self.db;
+		self.jail.database = self.db
 		actions = Actions(self.jail)
 		actions.add(
 			"action_checkainfo",

fail2ban/tests/failmanagertestcase.py

@@ -101,7 +101,7 @@ class AddFailure(unittest.TestCase):
 		self.assertEqual(
 			ticket_repr,
 			'FailTicket: ip=193.168.0.128 time=1167605999.0 #attempts=5 matches=[]')
-		self.assertFalse(ticket == False)
+		self.assertFalse(not ticket)
 		# and some get/set-ers otherwise not tested
 		ticket.setTime(1000002000.0)
 		self.assertEqual(ticket.getTime(), 1000002000.0)

fail2ban/tests/misctestcase.py

@@ -67,7 +67,8 @@ class SetupTest(unittest.TestCase):
 				" -- cannot locate setup.py")
 
 	def testSetupInstallRoot(self):
-		if not self.setup: return			  # if verbose skip didn't work out
+		if not self.setup:
+			return			  # if verbose skip didn't work out
 		tmp = tempfile.mkdtemp()
 		try:
 			os.system("%s %s install --root=%s >/dev/null"
@@ -138,8 +139,10 @@ class TestsUtilsTest(unittest.TestCase):
 				raise ValueError()
 
 			def deep_function(i):
-				if i: deep_function(i-1)
-				else: func_raise()
+				if i:
+					deep_function(i-1)
+				else:
+					func_raise()
 
 			try:
 				print deep_function(3)