Refactored error maps.

4 years ago · 81f73fe76d
2 changed files with 2 additions and 4 deletions
--- 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)
 )
--- 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')