From 81f73fe76d71a2956e823723af97febb3ccb11a9 Mon Sep 17 00:00:00 2001 From: Richard Neumann Date: Tue, 22 Dec 2020 22:28:51 +0100 Subject: [PATCH] Refactored error maps. --- rcon/rconclt.py | 3 +-- rcon/rconshell.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rcon/rconclt.py b/rcon/rconclt.py index dac4190..129eb08 100644 --- a/rcon/rconclt.py +++ b/rcon/rconclt.py @@ -20,8 +20,7 @@ __all__ = ['get_credentials', 'main'] ERRORS = ( (ConnectionRefusedError, 'Connection refused.', 3), - (timeout, 'Connection timeout.', 4), - (TimeoutError, 'Connection timeout.', 4), + ((TimeoutError, timeout), 'Connection timeout.', 4), (RequestIdMismatch, 'Unexpected request ID mismatch.', 5), (WrongPassword, 'Wrong password.', 6) ) diff --git a/rcon/rconshell.py b/rcon/rconshell.py index 9296b14..e743466 100644 --- a/rcon/rconshell.py +++ b/rcon/rconshell.py @@ -18,8 +18,7 @@ __all__ = ['get_args', 'main'] ERRORS = ( (ConnectionRefusedError, 'Connection refused.', 3), - (timeout, 'Connection timeout.', 4), - (TimeoutError, 'Connection timeout.', 4), + ((TimeoutError, timeout), 'Connection timeout.', 4), (RequestIdMismatch, 'Unexpected request ID mismatch.', 5) ) LOGGER = getLogger('rconshell')