From f0b2cd2e395a4b8e077d71f54d19d6e885da1f37 Mon Sep 17 00:00:00 2001 From: sebres Date: Wed, 13 Jul 2016 09:54:54 +0200 Subject: [PATCH] remove no more necessary PRODUCTION from fail2banclient.py --- fail2ban/client/fail2banclient.py | 15 ++++++--------- fail2ban/tests/fail2banclienttestcase.py | 1 - 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/fail2ban/client/fail2banclient.py b/fail2ban/client/fail2banclient.py index 4e42680b..9e6c4bd6 100755 --- a/fail2ban/client/fail2banclient.py +++ b/fail2ban/client/fail2banclient.py @@ -35,7 +35,7 @@ from ..version import version from .csocket import CSocket from .beautifier import Beautifier from .fail2bancmdline import Fail2banCmdLine, ServerExecutionException, ExitException, \ - logSys, PRODUCTION, exit, output + logSys, exit, output PROMPT = "fail2ban> " @@ -361,19 +361,16 @@ class Fail2banClient(Fail2banCmdLine, Thread): # Interactive mode if self._conf.get("interactive", False): - # no readline in test: - if PRODUCTION: # pragma: no cover - try: - import readline - except ImportError: - raise ServerExecutionException("Readline not available") + try: + import readline + except ImportError: + raise ServerExecutionException("Readline not available") try: ret = True if len(args) > 0: ret = self.__processCommand(args) if ret: - if PRODUCTION: # pragma: no cover - readline.parse_and_bind("tab: complete") + readline.parse_and_bind("tab: complete") self.dispInteractive() while True: cmd = input_command() diff --git a/fail2ban/tests/fail2banclienttestcase.py b/fail2ban/tests/fail2banclienttestcase.py index 2a18d204..ed2d3c46 100644 --- a/fail2ban/tests/fail2banclienttestcase.py +++ b/fail2ban/tests/fail2banclienttestcase.py @@ -107,7 +107,6 @@ fail2banclient.input_command = _test_input_command # prevents change logging params, log capturing, etc: fail2bancmdline.PRODUCTION = \ -fail2banclient.PRODUCTION = \ fail2banserver.PRODUCTION = False