From ad01231750cdfbc8eefafa104d5de34188148002 Mon Sep 17 00:00:00 2001 From: haosenwang1018 <167664334+haosenwang1018@users.noreply.github.com> Date: Thu, 26 Feb 2026 05:32:46 +0000 Subject: [PATCH] fix: replace 20 bare except clauses with except Exception --- fail2ban/client/configparserinc.py | 2 +- fail2ban/compat/asyncore.py | 12 ++++++------ fail2ban/helpers.py | 4 ++-- fail2ban/server/failregex.py | 2 +- fail2ban/server/filtersystemd.py | 2 +- fail2ban/server/ipdns.py | 4 ++-- fail2ban/server/server.py | 2 +- fail2ban/tests/actiontestcase.py | 4 ++-- fail2ban/tests/filtertestcase.py | 4 ++-- fail2ban/tests/misctestcase.py | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/fail2ban/client/configparserinc.py b/fail2ban/client/configparserinc.py index 11b9a461..1346f6a4 100644 --- a/fail2ban/client/configparserinc.py +++ b/fail2ban/client/configparserinc.py @@ -202,7 +202,7 @@ after = 1.conf rplcmnt = 1 try: # set it in map-vars (consider different python versions): defaults[sopt] = v - except: + except Exception: # try to set in first default map (corresponding vars): try: defaults._maps[0][sopt] = v diff --git a/fail2ban/compat/asyncore.py b/fail2ban/compat/asyncore.py index eeea4888..ce97f270 100644 --- a/fail2ban/compat/asyncore.py +++ b/fail2ban/compat/asyncore.py @@ -83,7 +83,7 @@ def read(obj): obj.handle_read_event() except _reraised_exceptions: raise - except: + except Exception: obj.handle_error() def write(obj): @@ -91,7 +91,7 @@ def write(obj): obj.handle_write_event() except _reraised_exceptions: raise - except: + except Exception: obj.handle_error() def _exception(obj): @@ -99,7 +99,7 @@ def _exception(obj): obj.handle_expt_event() except _reraised_exceptions: raise - except: + except Exception: obj.handle_error() def readwrite(obj, flags): @@ -119,7 +119,7 @@ def readwrite(obj, flags): obj.handle_close() except _reraised_exceptions: raise - except: + except Exception: obj.handle_error() def poll(timeout=0.0, map=None): @@ -459,7 +459,7 @@ class dispatcher: # sometimes a user repr method will crash. try: self_repr = repr(self) - except: + except Exception: self_repr = '<__repr__(self) failed for object at %0x>' % id(self) self.log_info( @@ -563,7 +563,7 @@ def close_all(map=None, ignore_all=False): raise except _reraised_exceptions: raise - except: + except Exception: if not ignore_all: raise map.clear() diff --git a/fail2ban/helpers.py b/fail2ban/helpers.py index 00aca138..d38efed7 100644 --- a/fail2ban/helpers.py +++ b/fail2ban/helpers.py @@ -36,7 +36,7 @@ import importlib try: import ctypes _libcap = ctypes.CDLL('libcap.so.2') -except: +except Exception: _libcap = None @@ -187,7 +187,7 @@ def __stopOnIOError(logSys=None, logHndlr=None): # pragma: no cover if logging.exitOnIOError: try: sys.stderr.close() - except: + except Exception: pass sys.exit(0) diff --git a/fail2ban/server/failregex.py b/fail2ban/server/failregex.py index 85636f36..e016a1e4 100644 --- a/fail2ban/server/failregex.py +++ b/fail2ban/server/failregex.py @@ -94,7 +94,7 @@ R_MAP = { try: re.search("^re(?i:val)$", "reVAL") R_GLOB2LOCFLAGS = ( re.compile(r"(?") setattr(self.__action, 'ab', "") setattr(self.__action, 'x?family=inet6', "") - # produce self-referencing properties except: + # produce self-referencing properties except Exception: self.assertRaisesRegex(ValueError, r"properties contain self referencing definitions", lambda: self.__action.replaceTag("", self.__action._properties, conditional="family=inet4") ) # remote self-referencing in props: delattr(self.__action, 'ac') - # produce self-referencing query except: + # produce self-referencing query except Exception: self.assertRaisesRegex(ValueError, r"possible self referencing definitions in query", lambda: self.__action.replaceTag(""*30, self.__action._properties, conditional="family=inet6") diff --git a/fail2ban/tests/filtertestcase.py b/fail2ban/tests/filtertestcase.py index ef25c50a..f1f0d302 100644 --- a/fail2ban/tests/filtertestcase.py +++ b/fail2ban/tests/filtertestcase.py @@ -70,11 +70,11 @@ def open(*args): def _killfile(f, name): try: f.close() - except: + except Exception: pass try: os.unlink(name) - except: + except Exception: pass # there might as well be the .bak file diff --git a/fail2ban/tests/misctestcase.py b/fail2ban/tests/misctestcase.py index 2d22256e..c8447378 100644 --- a/fail2ban/tests/misctestcase.py +++ b/fail2ban/tests/misctestcase.py @@ -43,7 +43,7 @@ class HelpersTest(unittest.TestCase): def testFormatExceptionInfoBasic(self): try: raise ValueError("Very bad exception") - except: + except Exception: name, args = formatExceptionInfo() self.assertEqual(name, "ValueError") self.assertEqual(args, "Very bad exception") @@ -51,7 +51,7 @@ class HelpersTest(unittest.TestCase): def testFormatExceptionConvertArgs(self): try: raise ValueError("Very bad", None) - except: + except Exception: name, args = formatExceptionInfo() self.assertEqual(name, "ValueError") # might be fragile due to ' vs "