[REGRESSION] Possible fix for some misconfigured tests (- WIP #117 -)

Author: reactive-firewall

multicast/__init__.py

@@ -28,9 +28,7 @@
 __all__ = [
 	"""__package__""", """__module__""", """__name__""", """__version__""", """__prologue__""",
 	"""__doc__""", """exceptions""", """exceptions.CommandExecutionError""",
-	"""exceptions.get_exit_code_from_exception""",
-	"""exceptions.get_exit_code_from_exception.__func__""",
-	"""exceptions.exit_on_exception""", """exceptions.exit_on_exception.__func__""",
+	"""exceptions.get_exit_code_from_exception""", """exceptions.exit_on_exception""",
 	"""get_exit_code_from_exception""", """exit_on_exception""",
 	"""skt""", """skt.__package__""", """skt.__module__""", """skt.__name__""",
 	"""skt.__file__""", """skt.genSocket""", """skt.genSocket.__func__""", """genSocket""",
@@ -358,8 +356,6 @@
 	raise ModuleNotFoundError("FAIL: we could not import Abstract base class. ABORT.") from None
 
 
-# global EXIT_CODES  # skipcq: PYL-W0604
-# global EXCEPTION_EXIT_CODES  # skipcq: PYL-W0604
 if 'multicast.exceptions' not in sys.modules:
 	# pylint: disable=cyclic-import - skipcq: PYL-R0401, PYL-C0414
 	from . import exceptions  # pylint: disable=cyclic-import - skipcq: PYL-R0401, PYL-C0414
@@ -627,9 +623,11 @@ def doStep(self, *args):  # pragma: no cover
 
 
 genSocket = skt.genSocket
+"""See multicast.skt.genSocket."""
 
 
 endSocket = skt.endSocket
+"""See multicast.skt.endSocket."""
 
 
 if 'multicast.recv' not in sys.modules:

multicast/exceptions.py

@@ -256,14 +256,16 @@ def get_exit_code_from_exception(exc):
 		Testcase 1: Exception with a mapped exit code.
 			>>> exc = FileNotFoundError('No such file or directory')
 			>>> get_exit_code_from_exception(exc)
-			66  # Exit code for FileNotFoundError
+			66
 
 		Testcase 2: Exception without a specific exit code.
 			>>> exc = Exception('Generic error')
 			>>> get_exit_code_from_exception(exc)
-			70  # Default exit code for internal software error
+			70
 
 	"""
+	if type(exc) in EXCEPTION_EXIT_CODES:
+		return EXCEPTION_EXIT_CODES[type(exc)]
 	for exc_class in EXCEPTION_EXIT_CODES:
 		if isinstance(exc, exc_class):
 			return EXCEPTION_EXIT_CODES[exc_class]
@@ -274,7 +276,10 @@ def exit_on_exception(func):
 	"""
 	Decorator that wraps a function to handle exceptions and exit with appropriate exit codes.
 
-	This decorator captures exceptions raised by the wrapped function and handles them by mapping them to predefined exit codes specified in `EXIT_CODES`. It ensures that both `SystemExit` exceptions (which may be raised by modules like `argparse`) and other base exceptions result in the program exiting with meaningful exit codes and error messages.
+	This decorator captures exceptions raised by the wrapped function and handles them by mapping
+	them to predefined exit codes specified in `EXIT_CODES`. It ensures that both `SystemExit`
+	exceptions (which may be raised by modules like `argparse`) and other base exceptions result
+	in the program exiting with meaningful exit codes and error messages.
 
 	Parameters:
 		func (callable): The function to be wrapped by the decorator.
@@ -303,7 +308,9 @@ def exit_on_exception(func):
 			>>> @exit_on_exception
 			... def system_exit_func():
 			...     raise SystemExit(64)
-			>>> system_exit_func()  # Exits with code 64
+			>>> system_exit_func()  #doctest: +IGNORE_EXCEPTION_DETAIL
+			Traceback (most recent call last):
+			SystemExit...64...
 
 		Testcase 3: Function raises a general exception.
 			A. Define a function that raises a `ValueError`.
@@ -313,8 +320,9 @@ def exit_on_exception(func):
 			>>> @exit_on_exception
 			... def error_func():
 			...     raise ValueError("Invalid value")
-			>>> error_func()  # Exits with code 65
-
+			>>> error_func()  #doctest: +IGNORE_EXCEPTION_DETAIL
+			Traceback (most recent call last):
+			SystemExit...65...
 	"""
 	def wrapper(*args, **kwargs):
 		try:
@@ -327,7 +335,7 @@ def wrapper(*args, **kwargs):
 					f"{EXIT_CODES.get(exit_code, (1, 'General Error'))[1]}: {exc}",
 					file=sys.stderr
 				)
-			raise SystemExit(code=exit_code) from exc
+			raise SystemExit(exit_code) from exc
 			# otherwise sys.exit(exit_code)
 		except BaseException as exc:
 			exit_code = get_exit_code_from_exception(exc)
@@ -336,6 +344,6 @@ def wrapper(*args, **kwargs):
 					f"{EXIT_CODES[exit_code][1]}: {exc}",
 					file=sys.stderr
 				)
-			raise SystemExit(code=exit_code) from exc
+			raise SystemExit(exit_code) from exc
 			# otherwise sys.exit(exit_code)
 	return wrapper