From e2a68bb02de740fb3a4d095d0af323f289e112fd Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 16 Jul 2015 17:15:11 -0400 Subject: [PATCH] RF: make Jail new style class, avoiding multiple inheritance with object --- fail2ban/server/jail.py | 2 +- fail2ban/tests/dummyjail.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fail2ban/server/jail.py b/fail2ban/server/jail.py index cf16737a..6345d300 100644 --- a/fail2ban/server/jail.py +++ b/fail2ban/server/jail.py @@ -33,7 +33,7 @@ from ..helpers import getLogger logSys = getLogger(__name__) -class Jail: +class Jail(object): """Fail2Ban jail, which manages a filter and associated actions. The class handles the initialisation of a filter, and actions. It's diff --git a/fail2ban/tests/dummyjail.py b/fail2ban/tests/dummyjail.py index 33a102f2..19f97f4e 100644 --- a/fail2ban/tests/dummyjail.py +++ b/fail2ban/tests/dummyjail.py @@ -28,7 +28,7 @@ from ..server.jail import Jail from ..server.actions import Actions -class DummyJail(Jail, object): +class DummyJail(Jail): """A simple 'jail' to suck in all the tickets generated by Filter's """ def __init__(self, backend=None):